artfully_ose 1.2.0.pre.18 → 1.2.0.pre.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +8 -8
  2. data/app/assets/javascripts/jquery-lib/jquery.mask-money.js +1 -0
  3. data/app/views/layouts/_flash.html.haml +1 -1
  4. data/app/views/memberships/index.html.haml +3 -3
  5. data/lib/artfully_ose/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MGNjMDg0YzRmMDRiM2FkYjFhMzU0NzBmY2YyNjA2OTNjMjUzMzAwNw==
4
+ M2E4OTBlNDU5Zjc0NGJmODQyY2ZmNzQ2ODI1OGEzYjQ2N2Q1ODAyZQ==
5
5
  data.tar.gz: !binary |-
6
- ODQ0MWUxN2EwYTNhOTRhOTdjNWEwM2I5NDViMTJlMzZjYmJmM2U3NQ==
6
+ ZGI1ZmRhMjY3MjhlZjc0YjJhYmNhZDQ0Yjc5ZDZhNGE4NGQ3NTlmNQ==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- MmRkN2FhMzU0NmQzYmE5ZDk1OTFjZWZkNjkyMGQ4YjRhYWRlY2IzYWQ3ODdh
10
- ZmU1MGNiNmZjOThjMjE5MDRkOGViOTBmMmYzYTUzZjNiYTEwYjNlOTQyYjFk
11
- OWE3NDM1M2U0ZDAyNThkOGVjMDI1NGRmMzE2ZjQ0ZjYyODNiNmE=
9
+ ODhhZDk0ZWFjOWMwNGU2NmQxMGI1NzkzNjI2NGFjZjQ2MDYwYjQzNjE0YWY0
10
+ MTUxZmFjMzdlMTI1MjA3YzYyZDBmNWRhOTgyYWVjODcyYWFjNThlMzJhYzA0
11
+ MzJjY2I0MmQ4MmJiNjJmMGMyYWU3YThhZDFjNzc2ZGE5MjgwOWY=
12
12
  data.tar.gz: !binary |-
13
- ZjJmNGE5YzdlMTdkMDc4ODZlYzQ3MzA3OTc2NjA5OGY5MDdlNjBhNjY3YmVk
14
- Y2EyZWQ1MzQ2OWNjZTU5OWRjZWY4NWZiNWY0OTBiZmM3MWE2N2YwY2VhM2Y2
15
- YTZjMDA1M2IyYjljNmJlNGUwMjA2NjZlYzk3Y2M5NjU4NTMyMTg=
13
+ ZjUyNWY5ODY4ZDA3NGY2MjU3YWU3OWM5NmNlYzA4MmM0Mzc3MjM4MGVkN2Jm
14
+ YjI4NmM2Njk5MzAzMTgzZTEzZWJjOTVmOTk1YzVhYTRhN2Y0MmRjZTZkMjM1
15
+ ZjI2YmFlZTFmOWRhYjJhYTQwNTAzYzI1MGFjM2UwMDg4MmJlN2Y=
data/app/assets/javascripts/jquery-lib/jquery.mask-money.js CHANGED
@@ -179,6 +179,7 @@
179
179
  } else if (settings.symbolStay && input.val() == settings.symbol){
180
180
  input.val(setSymbol(getDefaultMask()));
181
181
  }
182
+ input.change();
182
183
  }
183
184
  }
184
185
 
data/app/views/layouts/_flash.html.haml CHANGED
@@ -1,4 +1,4 @@
1
- - [:notice, :error, :alert, :info].each do |type|
1
+ - [:notice, :success, :error, :alert, :info].each do |type|
2
2
  - if flash[type]
3
3
  .flash{ "data-alert" => "alert", :class => [bootstrapped_type(type), type, 'alert'] }
4
4
  .close{ "data-dismiss" => "alert"} ×
data/app/views/memberships/index.html.haml CHANGED
@@ -19,7 +19,7 @@
19
19
  %li
20
20
  = link_to "Change Expiration", "#extend", 'data-toggle' => 'modal'
21
21
  %li
22
- = link_to "Change Membership", "#change", 'ng-controller' => 'ChangeMembershipController', 'ng-click' => 'changeSelected($event)'
22
+ = link_to "Change Membership Type", "#change", 'ng-controller' => 'ChangeMembershipController', 'ng-click' => 'changeSelected($event)'
23
23
  %li
24
24
  = link_to "Cancel Membership", "#cancel", 'data-toggle' => 'modal'
25
25
  .span6.right
@@ -43,7 +43,7 @@
43
43
  - if membership.expired?
44
44
  %tr{'ng-show' => 'scope.showExpired', 'ng-style' => 'scope.expiredStyle'}
45
45
  %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}", 'ng-disabled' => 'true'
46
- %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
46
+ %td.item-description=membership.membership_type.name
47
47
  %td.starts-at=l membership.starts_at, :format => :slashed_date
48
48
  %td.ends-at=l membership.ends_at, :format => :slashed_date
49
49
  %td.price.right=number_as_cents membership.sold_price
@@ -51,7 +51,7 @@
51
51
  - else
52
52
  %tr
53
53
  %td.grouped-checkbox= check_box_tag "membership_ids[]", membership.id, false, :id => "membership_id_#{membership.id}"
54
- %td.item-description=link_to membership.membership_type.name, membership_type_path(membership.membership_type.id)
54
+ %td.item-description=membership.membership_type.name
55
55
  %td.starts-at=l membership.starts_at, :format => :slashed_date
56
56
  %td.ends-at=l membership.ends_at, :format => :slashed_date
57
57
  %td.price.right=number_as_cents membership.sold_price
data/lib/artfully_ose/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ArtfullyOse
2
- VERSION = "1.2.0.pre.18"
2
+ VERSION = "1.2.0.pre.19"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: artfully_ose
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0.pre.18
4
+ version: 1.2.0.pre.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - Artful.ly
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-13 00:00:00.000000000 Z
11
+ date: 2014-01-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails