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/roles | |
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/roles')
-rw-r--r-- | app/views/roles/_form.rhtml | 28 | ||||
-rw-r--r-- | app/views/roles/edit.rhtml | 2 | ||||
-rw-r--r-- | app/views/roles/list.rhtml | 4 | ||||
-rw-r--r-- | app/views/roles/new.rhtml | 2 | ||||
-rw-r--r-- | app/views/roles/workflow.rhtml | 134 |
5 files changed, 85 insertions, 85 deletions
diff --git a/app/views/roles/_form.rhtml b/app/views/roles/_form.rhtml index 7cd83fd45..a80d990f9 100644 --- a/app/views/roles/_form.rhtml +++ b/app/views/roles/_form.rhtml @@ -1,21 +1,21 @@ <%= error_messages_for 'role' %> <div class="box"> -<!--[form:role]-->
-<p><%= f.text_field :name, :required => true %></p>
-
-<h3><%=l(:label_permissions)%></h3>
-<% permissions = @permissions.group_by {|p| p.group_id } %>
+<!--[form:role]--> +<p><%= f.text_field :name, :required => true %></p> + +<h3><%=l(:label_permissions)%></h3> +<% permissions = @permissions.group_by {|p| p.group_id } %> <% permissions.keys.sort.each do |group_id| %> -<fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
-<% permissions[group_id].each do |p| %>
- <div style="width:170px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %>
- <%= l(p.description.to_sym) %>
- </div>
+<fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend> +<% permissions[group_id].each do |p| %> + <div style="width:170px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %> + <%= l(p.description.to_sym) %> + </div> +<% end %> +<div class="clear"></div> +</fieldset> <% end %> -<div class="clear"></div>
-</fieldset>
-<% end %>
<br /> -<%= check_all_links 'role_form' %>
+<%= check_all_links 'role_form' %> <!--[eoform:role]--> </div> diff --git a/app/views/roles/edit.rhtml b/app/views/roles/edit.rhtml index ffe117cef..4a591e3e4 100644 --- a/app/views/roles/edit.rhtml +++ b/app/views/roles/edit.rhtml @@ -3,4 +3,4 @@ <% labelled_tabular_form_for :role, @role, :url => { :action => 'edit' }, :html => {:id => 'role_form'} do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_save) %> -<% end %>
+<% end %> diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml index c6c4492b3..872c62ee8 100644 --- a/app/views/roles/list.rhtml +++ b/app/views/roles/list.rhtml @@ -21,10 +21,10 @@ <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => role, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %> </td> <td align="center"> - <%= button_to l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
+ <%= button_to l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small" %> </tr> <% end %> </tbody> </table> -
+ <%= pagination_links_full @role_pages %>
\ No newline at end of file diff --git a/app/views/roles/new.rhtml b/app/views/roles/new.rhtml index a73c36cb1..8f03aefac 100644 --- a/app/views/roles/new.rhtml +++ b/app/views/roles/new.rhtml @@ -1,5 +1,5 @@ <h2><%=l(:label_role_new)%></h2> -
+ <% labelled_tabular_form_for :role, @role, :url => { :action => 'new' }, :html => {:id => 'role_form'} do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_create) %> diff --git a/app/views/roles/workflow.rhtml b/app/views/roles/workflow.rhtml index 620b37009..f62cca50e 100644 --- a/app/views/roles/workflow.rhtml +++ b/app/views/roles/workflow.rhtml @@ -1,69 +1,69 @@ -<h2><%=l(:label_workflow)%></h2>
-
-<p><%=l(:text_workflow_edit)%>:</p>
-
-<% form_tag ({:action => 'workflow'}, :method => 'get') do %>
-<div style="float:left;margin-right:10px;">
-<p><label for="role_id"><%=l(:label_role)%></label><br/>
-<select id="role_id" name="role_id">
- <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %>
-</select></p>
-</div>
-
-<div>
-<p><label for="tracker_id"><%=l(:label_tracker)%></label><br/>
-<select id="tracker_id" name="tracker_id">
- <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %>
-</select>
-
-<%= submit_tag l(:button_edit) %>
-</p>
-</div>
-<% end %>
-
-
-
-<% unless @tracker.nil? or @role.nil? %>
-<div class="box">
- <% form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) do %>
- <table>
- <tr>
- <td align="center"><strong><%=l(:label_current_status)%></strong></td>
- <td align="center" colspan="<%= @statuses.length %>"><strong><%=l(:label_new_statuses_allowed)%></strong></td>
- </tr>
- <tr>
- <td></td>
- <% for new_status in @statuses %>
- <td width="80" align="center"><%= new_status.name %></td>
- <% end %>
- </tr>
-
- <% for old_status in @statuses %>
- <tr>
- <td><div class="square" style="background:#<%= old_status.html_color %>;"></div> <%= old_status.name %></td>
- <% for new_status in @statuses %>
- <td align="center">
-
- <input type="checkbox"
- name="issue_status[<%= old_status.id %>][]"
- value="<%= new_status.id %>"
- <%if old_status.new_statuses_allowed_to(@role, @tracker).include? new_status%>checked="checked"<%end%>
- <%if old_status==new_status%>disabled<%end%>
- >
- </td>
- <% end %>
-
- </tr>
- <% end %>
- </table>
-<br />
-<p>
-<a href="javascript:checkAll('workflow_form', true)"><%=l(:button_check_all)%></a> |
-<a href="javascript:checkAll('workflow_form', false)"><%=l(:button_uncheck_all)%></a>
-</p>
-<br />
+<h2><%=l(:label_workflow)%></h2> + +<p><%=l(:text_workflow_edit)%>:</p> + +<% form_tag ({:action => 'workflow'}, :method => 'get') do %> +<div style="float:left;margin-right:10px;"> +<p><label for="role_id"><%=l(:label_role)%></label><br/> +<select id="role_id" name="role_id"> + <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %> +</select></p> +</div> + +<div> +<p><label for="tracker_id"><%=l(:label_tracker)%></label><br/> +<select id="tracker_id" name="tracker_id"> + <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %> +</select> + +<%= submit_tag l(:button_edit) %> +</p> +</div> +<% end %> + + + +<% unless @tracker.nil? or @role.nil? %> +<div class="box"> + <% form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) do %> + <table> + <tr> + <td align="center"><strong><%=l(:label_current_status)%></strong></td> + <td align="center" colspan="<%= @statuses.length %>"><strong><%=l(:label_new_statuses_allowed)%></strong></td> + </tr> + <tr> + <td></td> + <% for new_status in @statuses %> + <td width="80" align="center"><%= new_status.name %></td> + <% end %> + </tr> + + <% for old_status in @statuses %> + <tr> + <td><div class="square" style="background:#<%= old_status.html_color %>;"></div> <%= old_status.name %></td> + <% for new_status in @statuses %> + <td align="center"> + + <input type="checkbox" + name="issue_status[<%= old_status.id %>][]" + value="<%= new_status.id %>" + <%if old_status.new_statuses_allowed_to(@role, @tracker).include? new_status%>checked="checked"<%end%> + <%if old_status==new_status%>disabled<%end%> + > + </td> + <% end %> + + </tr> + <% end %> + </table> +<br /> +<p> +<a href="javascript:checkAll('workflow_form', true)"><%=l(:button_check_all)%></a> | +<a href="javascript:checkAll('workflow_form', false)"><%=l(:button_uncheck_all)%></a> +</p> +<br /> <%= submit_tag l(:button_save) %> -<% end %>
-
-<% end %>
+<% end %> + +<% end %> </div>
\ No newline at end of file |