Merge branch 'develop'

7 files changed, 42 insertions, 0 deletions

diff --git a/app/views/user_group_memberships/_form.html.haml b/app/views/user_group_memberships/_form.html.haml
new file mode 100644
index 0000000..3c0fee1
--- /dev/null
+++ b/app/views/user_group_memberships/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for([@user_group, @user_group_membership]) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .actions
+    = f.button :submit, conditional_t('user_group_memberships.form.submit')
\ No newline at end of file
diff --git a/app/views/user_group_memberships/_form_core.html.haml b/app/views/user_group_memberships/_form_core.html.haml
new file mode 100644
index 0000000..e77427f
--- /dev/null
+++ b/app/views/user_group_memberships/_form_core.html.haml
@@ -0,0 +1,2 @@
+.inputs
+  = f.input :user_id, :label => t('hunt_groups.form.user.label'), :hint => conditional_hint('hunt_groups.form.user.hint'), :collection => @potential_users, :include_blank => false
\ No newline at end of file
diff --git a/app/views/user_group_memberships/_index_core.html.haml b/app/views/user_group_memberships/_index_core.html.haml
new file mode 100644
index 0000000..3c3cebe
--- /dev/null
+++ b/app/views/user_group_memberships/_index_core.html.haml
@@ -0,0 +1,13 @@
+%table
+  %tr
+    %th= t('user_group_memberships.index.tenant')
+    %th= t('user_group_memberships.index.user_group')
+    %th= t('user_group_memberships.index.user')
+
+  - reset_cycle
+  - for user_group_membership in user_group_memberships
+    %tr{:class => cycle('odd', 'even')}
+      %td= user_group_membership.user_group.tenant
+      %td= user_group_membership.user_group
+      %td= user_group_membership.user
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user_group_membership.user_group, :child => user_group_membership}
\ No newline at end of file
diff --git a/app/views/user_group_memberships/edit.html.haml b/app/views/user_group_memberships/edit.html.haml
new file mode 100644
index 0000000..2080c87
--- /dev/null
+++ b/app/views/user_group_memberships/edit.html.haml
@@ -0,0 +1,3 @@
+- title t("user_group_memberships.edit.page_title", :resource => @user_group_membership)
+
+= render "form"
diff --git a/app/views/user_group_memberships/index.html.haml b/app/views/user_group_memberships/index.html.haml
new file mode 100644
index 0000000..1d7927b
--- /dev/null
+++ b/app/views/user_group_memberships/index.html.haml
@@ -0,0 +1,7 @@
+- title t("user_group_memberships.index.page_title")
+
+- if @user_group_memberships.count > 0
+  = render "index_core", :user_group_memberships => @user_group_memberships
+
+- if @potential_users_count > 0
+  = render :partial => 'shared/create_link', :locals => {:parent => @user_group, :child_class => UserGroupMembership}
\ No newline at end of file
diff --git a/app/views/user_group_memberships/new.html.haml b/app/views/user_group_memberships/new.html.haml
new file mode 100644
index 0000000..9d59fdd
--- /dev/null
+++ b/app/views/user_group_memberships/new.html.haml
@@ -0,0 +1,3 @@
+- title t("user_group_memberships.new.page_title")
+
+= render "form"
diff --git a/app/views/user_group_memberships/show.html.haml b/app/views/user_group_memberships/show.html.haml
new file mode 100644
index 0000000..0e5cfab
--- /dev/null
+++ b/app/views/user_group_memberships/show.html.haml
@@ -0,0 +1,7 @@
+- title t("user_group_memberships.show.page_title")
+
+%p
+  %strong= t('user_group_memberships.show.user') + ":"
+  = @user_group_membership.user
+
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @user_group, :child => @user_group_membership }
\ No newline at end of file