Merge pull request #4314 from Undev/feature/redesign_forms

Switch form from table to plain form without member list
2026-08-13 22:59:19 +10:00 · 2013-06-14 05:20:22 -07:00
parent a59fe739fe 815c186b29
commit da98cebc5b
1 changed files with 26 additions and 28 deletions
@@ -1,29 +1,27 @@
 %h3.page_title
-  Team: #{@team.name}
-
-%fieldset
-  %legend Members (#{@team.members.count})
-  = form_tag admin_team_members_path(@team), id: "team_members", class: "bulk_import", method: :post  do
-    %table#members_list
-      %thead
-        %tr
-          %th User name
-          %th Default project access
-          %th Team access
-          %th
-      - @team.members.each do |member|
-        %tr.member
-          %td
-            = link_to [:admin, member] do
-              = member.name
-              %small= "(#{member.email})"
-          %td= @team.human_default_projects_access(member)
-          %td= @team.admin?(member) ? "Admin" : "Member"
-          %td
-      %tr
-        %td= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name_with_username), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5'
-        %td= select_tag :default_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" }
-        %td
-          %span= check_box_tag :group_admin
-          %span Admin?
-        %td= submit_tag 'Add', class: "btn btn-primary", id: :add_members_to_team
+  New members for
+  = link_to @team.name, admin_team_path(@team)
+  team
+%hr
+= form_tag admin_team_members_path(@team), id: "team_members", class: "bulk_import", method: :post  do
+  - if @team.errors.any?
+    .alert.alert-error
+      %span= @team.errors.full_messages.first
+  .clearfix
+    = label_tag :user_ids do
+      Users to add
+    .input
+      = select_tag :user_ids, options_from_collection_for_select(@users , :id, :name_with_username), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5'
+  .clearfix.group-description-holder
+    = label_tag :default_project_access do
+      Default permission in projects
+    .input
+      = select_tag :default_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" }
+  .clearfix
+    = label_tag :group_admin do
+      Is team admin
+    .input
+      = check_box_tag :group_admin
+  .clearfix.form-actions
+    = submit_tag 'Add users into team', class: "btn btn-primary", id: :add_members_to_team
+    = link_to 'Cancel', :back, class: "btn"