From: Toshi MARUYAMA Date: Sat, 27 Aug 2011 23:47:03 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/workflows/edit.rhtml. X-Git-Tag: 1.3.0~1280 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=260bdef82b20e4cdbb360fa4f91433d90f7f7543;p=redmine.git rename .rhtml to .html.erb of app/views/workflows/edit.rhtml. :rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6682 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb new file mode 100644 index 000000000..d01ea37db --- /dev/null +++ b/app/views/workflows/edit.html.erb @@ -0,0 +1,50 @@ +<%= render :partial => 'action_menu' %> + +

<%=l(:label_workflow)%>

+ +

<%=l(:text_workflow_edit)%>:

+ +<% form_tag({}, :method => 'get') do %> +

+ + <%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %> + + + <%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %> + + <%= hidden_field_tag 'used_statuses_only', '0' %> + +

+

+<%= submit_tag l(:button_edit), :name => nil %> +

+<% end %> + +<% if @tracker && @role && @statuses.any? %> + <% form_tag({}, :id => 'workflow_form' ) do %> + <%= hidden_field_tag 'tracker_id', @tracker.id %> + <%= hidden_field_tag 'role_id', @role.id %> +
+ <%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %> + +
+ <%= l(:label_additional_workflow_transitions_for_author) %> +
+ <%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %> +
+
+ <%= javascript_tag "hideFieldset($('author_workflows'))" unless @workflows['author'].present? %> + +
+ <%= l(:label_additional_workflow_transitions_for_assignee) %> +
+ <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %> +
+
+ <%= javascript_tag "hideFieldset($('assignee_workflows'))" unless @workflows['assignee'].present? %> +
+ <%= submit_tag l(:button_save) %> + <% end %> +<% end %> + +<% html_title(l(:label_workflow)) -%> diff --git a/app/views/workflows/edit.rhtml b/app/views/workflows/edit.rhtml deleted file mode 100644 index d01ea37db..000000000 --- a/app/views/workflows/edit.rhtml +++ /dev/null @@ -1,50 +0,0 @@ -<%= render :partial => 'action_menu' %> - -

<%=l(:label_workflow)%>

- -

<%=l(:text_workflow_edit)%>:

- -<% form_tag({}, :method => 'get') do %> -

- - <%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %> - - - <%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %> - - <%= hidden_field_tag 'used_statuses_only', '0' %> - -

-

-<%= submit_tag l(:button_edit), :name => nil %> -

-<% end %> - -<% if @tracker && @role && @statuses.any? %> - <% form_tag({}, :id => 'workflow_form' ) do %> - <%= hidden_field_tag 'tracker_id', @tracker.id %> - <%= hidden_field_tag 'role_id', @role.id %> -
- <%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %> - -
- <%= l(:label_additional_workflow_transitions_for_author) %> -
- <%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %> -
-
- <%= javascript_tag "hideFieldset($('author_workflows'))" unless @workflows['author'].present? %> - -
- <%= l(:label_additional_workflow_transitions_for_assignee) %> -
- <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %> -
-
- <%= javascript_tag "hideFieldset($('assignee_workflows'))" unless @workflows['assignee'].present? %> -
- <%= submit_tag l(:button_save) %> - <% end %> -<% end %> - -<% html_title(l(:label_workflow)) -%>