app/views/memberships/index.html.haml in artfully_ose-1.2.0.pre.23 vs app/views/memberships/index.html.haml in artfully_ose-1.2.0.pre.24
- old
+ new
@@ -8,11 +8,11 @@
.span12
.row-fluid
.span6
%ul.in-table{'ng-controller' => 'MembershipActionsCtrl'}
%li.dropdown{:id => "#menu#bulkactions"}
- =icon_link_to('Work with...', "#menu#bulkactions", 'icon-asterisk', 'dropdown-toggle dropdown btn', '')
+ =icon_link_to('Work with...', "#menu#bulkactions", 'fa-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}}'
@@ -24,11 +24,11 @@
%li
= link_to "Change Membership Type", "#change", 'ng-click' => 'change($event)'
%li
= link_to "Cancel Membership", "#cancel", 'ng-click' => 'cancel($event)'
.span6.right
- = icon_link_to("View Record", person_path(@person), 'icon-share-alt', 'btn', '')
+ = icon_link_to("View Record", person_path(@person), 'fa-share-alt', 'btn', '')
-# = 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
@@ -71,21 +71,21 @@
.controls
.datepicker-alt-field
=hidden_field_tag "ends_at", ""
.modal-footer
=submit_tag "Change Expiration", :class => "btn btn-success"
- =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
+ =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
#full-refund.modal
.modal-header
.close{'data-dismiss'=>'modal'} x
%h3 Refund Membership
.modal-body
- %p="#{@person} will receive a full refund for these memberships"
+ %p="#{@person} will receive a full refund for these memberships"
.modal-footer
=link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
- =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
+ =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
#change.modal{'ng-controller' => 'ChangeMembershipController'}
=form_tag person_membership_changes_path, :class => "form-horizontal", 'novalidate' => 'novalidate', 'name' => 'changeForm', :method => :post do
.modal-header
.close{'data-dismiss'=>'modal'} x
@@ -142,19 +142,19 @@
.modal-body
.control-group
%label Enter refund amount:
.controls
=text_field_tag "whatever", "", :class => "currency"
- %p="#{@person} will receive a partial refund for the above amount and these memberships will be cancelled."
+ %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'
#reset-password-modal.modal
.modal-header
.close{'data-dismiss'=>'modal'} x
%h3 Reset Password
.modal-body
- %p="This member will receive an email with a link to reset their password so they can log in to their member dashboard."
+ %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 "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'