@@ -1,16 +1,12 | |||||
1 | <% form_tag({}, :id => 'query_form') do %> |
|
|||
2 | <% if @query.new_record? %> |
|
|||
3 |
|
|
1 | <h2><%= l(:label_calendar) %></h2> | |
|
2 | ||||
|
3 | <% form_tag({}, :id => 'query_form') do %> | |||
4 | <fieldset id="filters" class="collapsible"> |
|
4 | <fieldset id="filters" class="collapsible"> | |
5 | <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend> |
|
5 | <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend> | |
6 | <div> |
|
6 | <div> | |
7 | <%= render :partial => 'queries/filters', :locals => {:query => @query} %> |
|
7 | <%= render :partial => 'queries/filters', :locals => {:query => @query} %> | |
8 | </div> |
|
8 | </div> | |
9 | </fieldset> |
|
9 | </fieldset> | |
10 | <% else %> |
|
|||
11 | <h2><%=h @query.name %></h2> |
|
|||
12 | <% html_title @query.name %> |
|
|||
13 | <% end %> |
|
|||
14 |
|
10 | |||
15 | <p style="float:right;"> |
|
11 | <p style="float:right;"> | |
16 | <%= link_to_remote ('« ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), |
|
12 | <%= link_to_remote ('« ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), |
@@ -1,16 +1,12 | |||||
|
1 | <h2><%= l(:label_gantt) %></h2> | |||
|
2 | ||||
1 | <% form_tag(params.merge(:month => nil, :year => nil, :months => nil), :id => 'query_form') do %> |
|
3 | <% form_tag(params.merge(:month => nil, :year => nil, :months => nil), :id => 'query_form') do %> | |
2 | <% if @query.new_record? %> |
|
|||
3 | <h2><%=l(:label_gantt)%></h2> |
|
|||
4 | <fieldset id="filters" class="collapsible"> |
|
4 | <fieldset id="filters" class="collapsible"> | |
5 | <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend> |
|
5 | <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend> | |
6 | <div> |
|
6 | <div> | |
7 | <%= render :partial => 'queries/filters', :locals => {:query => @query} %> |
|
7 | <%= render :partial => 'queries/filters', :locals => {:query => @query} %> | |
8 | </div> |
|
8 | </div> | |
9 | </fieldset> |
|
9 | </fieldset> | |
10 | <% else %> |
|
|||
11 | <h2><%=h @query.name %></h2> |
|
|||
12 | <% html_title @query.name %> |
|
|||
13 | <% end %> |
|
|||
14 |
|
10 | |||
15 | <p style="float:right;"> |
|
11 | <p style="float:right;"> | |
16 | <%= if @gantt.zoom < 4 |
|
12 | <%= if @gantt.zoom < 4 |
@@ -1,8 +1,14 | |||||
1 | <% if @query.new_record? %> |
|
1 | <div class="contextual"> | |
2 | <h2><%=l(:label_issue_plural)%></h2> |
|
2 | <% if !@query.new_record? && @query.editable_by?(User.current) %> | |
3 | <% html_title(l(:label_issue_plural)) %> |
|
3 | <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %> | |
4 |
|
4 | <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> | ||
5 | <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %> |
|
5 | <% end %> | |
|
6 | </div> | |||
|
7 | ||||
|
8 | <h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2> | |||
|
9 | <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %> | |||
|
10 | ||||
|
11 | <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %> | |||
6 | <%= hidden_field_tag('project_id', @project.to_param) if @project %> |
|
12 | <%= hidden_field_tag('project_id', @project.to_param) if @project %> | |
7 | <div id="query_form_content"> |
|
13 | <div id="query_form_content"> | |
8 | <fieldset id="filters" class="collapsible"> |
|
14 | <fieldset id="filters" class="collapsible"> | |
@@ -33,21 +39,10 | |||||
33 | :update => "content", |
|
39 | :update => "content", | |
34 | }, :class => 'icon icon-reload' %> |
|
40 | }, :class => 'icon icon-reload' %> | |
35 |
|
41 | |||
36 | <% if User.current.allowed_to?(:save_queries, @project, :global => true) %> |
|
42 | <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %> | |
37 | <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %> |
|
43 | <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %> | |
38 | <% end %> |
|
44 | <% end %> | |
39 | </p> |
|
45 | </p> | |
40 | <% end %> |
|
|||
41 | <% else %> |
|
|||
42 | <div class="contextual"> |
|
|||
43 | <% if @query.editable_by?(User.current) %> |
|
|||
44 | <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %> |
|
|||
45 | <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> |
|
|||
46 | <% end %> |
|
|||
47 | </div> |
|
|||
48 | <h2><%=h @query.name %></h2> |
|
|||
49 | <div id="query_form"></div> |
|
|||
50 | <% html_title @query.name %> |
|
|||
51 | <% end %> |
|
46 | <% end %> | |
52 |
|
47 | |||
53 | <%= error_messages_for 'query' %> |
|
48 | <%= error_messages_for 'query' %> |
General Comments 0
You need to be logged in to leave comments.
Login now