bullet_train-themes 1.0.12 → 1.0.15

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8ce3b21afad1661e55eebbd080500931ca976430a2ada9a373eb7e3157c624a2
4
- data.tar.gz: a281fa708287b6d0992dc2d063e303781125a1b61817946ca4ea5384e6ad1bc3
3
+ metadata.gz: bd409878f3adddc657c662621fcc77f5be37a4ef2090c1507c03256895c1cb47
4
+ data.tar.gz: 4778f9329b7ca552650e91fd84e3bb71ba3cae944ebaa493e1b8409e16f077f4
5
5
  SHA512:
6
- metadata.gz: 546338a06bd0aeed964446028eac86d1a8f50a39c92b27f97724827bce68cd859e1af0f3720a2b1dd10b41188deae52c038ac2d8dc7228c901ed296654d3bff7
7
- data.tar.gz: 9bb53dbca59f55ffd2bb616c99e90c02202c55367ae0b596f1bdf36fc52021139c15dafa278cbc298c7330c0f542a7242da571133a6eada48b512c90a2f69b82
6
+ metadata.gz: 1aec47adc6c701406d5b4e7b0b829048d6a4a3bd8267420d25615b3ce4c4af6225ef53f05552cac1190863cb3e4102ad0c080802acf574b7d6a0e39b9bbcd2be
7
+ data.tar.gz: a8a31261b99d18c5de315c394697544b07c2b5677fb3c5aacf4379358a54b28861257747bb4d2e43a1da3ae5808d1428c67f191c9609ec6b2a5920a54ecb2508
@@ -8,12 +8,6 @@ module ThemeHelper
8
8
  /^shared\//,
9
9
  ]
10
10
 
11
- def current_theme
12
- # Temporarily hardcoded. We actually don't want this to be just an `mattr_accessor` because the same application
13
- # can use multiple themes. Need to think about this a bit.
14
- :light
15
- end
16
-
17
11
  def current_theme_object
18
12
  @current_theme_object ||= "BulletTrain::Themes::#{current_theme.to_s.classify}::Theme".constantize.new
19
13
  end
@@ -4,6 +4,6 @@
4
4
 
5
5
  <% if object.send(attribute).present? %>
6
6
  <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
7
- <%= display_date(object.send(attribute)) %>
7
+ <%= display_date(object.send(attribute), local_assigns[:date_format]) %>
8
8
  <% end %>
9
9
  <% end %>
@@ -4,6 +4,6 @@
4
4
 
5
5
  <% if object.send(attribute).present? %>
6
6
  <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
7
- <%= display_date_and_time(object.send(attribute)) %>
7
+ <%= display_date_and_time(object.send(attribute), local_assigns[:date_format], local_assigns[:time_format]) %>
8
8
  <% end %>
9
9
  <% end %>
@@ -7,12 +7,12 @@ options ||= {}
7
7
  options[:class] = "formatted_content trix-content #{options[:class]}"
8
8
  options[:placeholder] ||= labels.placeholder if labels.placeholder
9
9
  options[:data] ||= {}
10
- options[:data][:mentions] = ([current_team].map { |team|
10
+ options[:data][:mentions] ||= ([current_team].map { |team|
11
11
  {key: team.name, value: team.id, protocol: 'bullettrain', model: 'teams', id: team.id, label: team.name, photo: photo_for(team)}
12
12
  } + current_team.memberships.current_and_invited.map { |membership|
13
13
  {key: membership.name, value: membership.id, protocol: 'bullettrain', model: 'memberships', id: membership.id, label: membership.name, photo: membership_profile_photo_url(membership)}
14
14
  }).to_json
15
- options[:data][:topics] = []
15
+ options[:data][:topics] ||= []
16
16
  # current_team.scaffolding_things.map { |scaffolding_thing|
17
17
  # {key: scaffolding_thing.name, value: scaffolding_thing.id, protocol: 'bullettrain', model: 'scaffolding/things', id: scaffolding_thing.id, label: scaffolding_thing.name, photo: photo_for(scaffolding_thing)}
18
18
  # }.to_json
@@ -1,5 +1,5 @@
1
1
  module BulletTrain
2
2
  module Themes
3
- VERSION = "1.0.12"
3
+ VERSION = "1.0.15"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bullet_train-themes
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.12
4
+ version: 1.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Culver
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-05-22 00:00:00.000000000 Z
11
+ date: 2022-05-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
87
87
  - !ruby/object:Gem::Version
88
88
  version: '0'
89
89
  requirements: []
90
- rubygems_version: 3.3.7
90
+ rubygems_version: 3.2.22
91
91
  signing_key:
92
92
  specification_version: 4
93
93
  summary: Bullet Train Themes