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

- old
+ new

@@ -17,11 +17,11 @@ %li = link_to "Partial Refund", "#partial-refund", 'data-toggle' => 'modal' %li = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal' %li - = link_to "Change Membership", "#change", 'ng-controller' => 'ChangeMembershipController', 'ng-click' => 'changeSelected($event)' + = link_to "Change Membership Type", "#change", 'ng-controller' => 'ChangeMembershipController', 'ng-click' => 'changeSelected($event)' %li = link_to "Cancel Membership", "#cancel", 'data-toggle' => 'modal' .span6.right = icon_link_to("View Record", person_path(@person), 'icon-share-alt', 'btn', '') = link_to "Log In", "#", 'data-toggle' => 'modal', :class => 'btn' @@ -41,18 +41,18 @@ %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=link_to membership.membership_type.name, membership_type_path(membership.membership_type.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 - else %tr %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}" - %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.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