app/views/memberships/index.html.haml in artfully_ose-1.2.0.pre.19 vs app/views/memberships/index.html.haml in artfully_ose-1.2.0.pre.20

@@ -6,28 +6,31 @@
 
 .row
   .span12
     .row-fluid
       .span6
-        %ul.in-table
+        %ul.in-table{'ng-controller' => 'MembershipActionsCtrl'}
           %li.dropdown{:id => "#menu#bulkactions"}
             =icon_link_to('Work with...', "#menu#bulkactions", 'icon-asterisk', 'dropdown-toggle dropdown btn', '')
+            =image_tag "loading.gif", :class => 'loading-indicator', 'ng-show' => 'loading'
+            .alert{'ng-show' => 'error'}
+              %button.close{'ng-click' => 'error = false'}
+                ×
+              ='{{errorMessage}}'
             %ul.dropdown-menu
+              -# %li= link_to "Full Refund", "#full-refund", 'data-toggle' => 'modal'
+              -# %li= link_to "Partial Refund", "#partial-refund", 'data-toggle' => 'modal'
               %li
-                = link_to "Full Refund", "#full-refund", 'data-toggle' => 'modal'
-              %li
-                = link_to "Partial Refund", "#partial-refund", 'data-toggle' => 'modal'
-              %li
                 = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
               %li
-                = link_to "Change Membership Type", "#change", 'ng-controller' => 'ChangeMembershipController', 'ng-click' => 'changeSelected($event)'
+                = link_to "Change Membership Type", "#change", 'ng-click' => 'change($event)'
               %li
-                = link_to "Cancel Membership", "#cancel", 'data-toggle' => 'modal'
+                = link_to "Cancel Membership", "#cancel", 'ng-click' => 'cancel($event)'
       .span6.right
         = icon_link_to("View Record", person_path(@person), 'icon-share-alt', 'btn', '')
-        = link_to "Log In", "#", 'data-toggle' => 'modal', :class => 'btn'
-        = link_to "Reset Password", "#", 'data-toggle' => 'modal', :class => 'btn btn-danger'
+        -# = link_to "Log In", "#", 'data-toggle' => 'modal', :class => 'btn'
+        = link_to "Reset Password", "#reset-password-modal", 'data-toggle' => 'modal', :class => 'btn btn-danger'
 
     =form_tag bulk_update_person_memberships_path(@person), :method => :post do
       #items
         %table.zebra.table{'ng-init' => "scope = { showExpired: false, expiredStyle: {textDecoration: 'line-through'} }"}
           %thead
@@ -35,29 +38,26 @@
               %th.grouped-checkbox= check_box_tag :all, nil, false, :class => :checkall
               %th Membership Type
               %th Starts
               %th Expires
               %th.right Price Paid
-              %th.right Fee
           %tbody
             - @person.memberships.each do |membership|
               - if membership.expired?
                 %tr{'ng-show' => 'scope.showExpired', 'ng-style' => 'scope.expiredStyle'}
                   %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}", 'ng-disabled' => 'true'
                   %td.item-description=membership.membership_type.name
                   %td.starts-at=l membership.starts_at, :format => :slashed_date
                   %td.ends-at=l membership.ends_at, :format => :slashed_date
                   %td.price.right=number_as_cents membership.sold_price
-                  %td.fee.right TODO
               - else
                 %tr
                   %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}"
                   %td.item-description=membership.membership_type.name
                   %td.starts-at=l membership.starts_at, :format => :slashed_date
                   %td.ends-at=l membership.ends_at, :format => :slashed_date
                   %td.price.right=number_as_cents membership.sold_price
-                  %td.fee.right TODO
 
       - if @expired_count > 0
         = link_to "See #{@expired_count} lapsed & expired memberships", '#', 'ng-show' => '!scope.showExpired', 'ng-click' => 'scope.showExpired = true'
         = link_to "Hide #{@expired_count} lapsed & expired memberships", '#', 'ng-show' => 'scope.showExpired', 'ng-click' => 'scope.showExpired = false'
 
@@ -155,14 +155,15 @@
         %p="#{@person} will receive a partial refund for the above amount and these memberships will be cancelled."  
       .modal-footer
         =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
         =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
 
-    #cancel.modal
+    #reset-password-modal.modal
       .modal-header
         .close{'data-dismiss'=>'modal'} x
-        %h3 Cancel Membership
+        %h3 Reset Password
       .modal-body
-        %p="These memberships will be cancelled."  
+        %p="This member will receive an email with a link to reset their password so they can log in to their member dashboard."  
       .modal-footer
-        =link_to "Cancel Memberhships", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
-        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
+        =link_to "Send Password Reset", reset_password_person_path(@person), :class => "btn btn-primary", 'data-dismiss'=>'modal', :method => :post
+        =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
+= render partial: 'membership_scripts.js'
\ No newline at end of file