tenon 2.0.0 → 2.0.1

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 +4 -4
  2. data/app/views/layouts/tenon/application.html.haml +3 -9
  3. data/app/views/tenon/shared/_assets.html.haml +13 -0
  4. data/lib/tenon/version.rb +1 -1
  5. data/lib/tenon.rb +1 -1
  6. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d39f7dfa4e24d93944c10c4ff5d70a0e0174e54f
4
- data.tar.gz: db0ad6511450af0ea4fbfeb83f48efe582a2be9c
3
+ metadata.gz: 4f2a5900f85953634fc61739c267f51fc173794f
4
+ data.tar.gz: c1f20110a254097d235dd221167b50271a8cf7d1
5
5
  SHA512:
6
- metadata.gz: a3e6fe7541b3a61f1803488675d28da6b49008b6ec24f6d8373cc99f6484b156c8392f524749645e9d25fd6386d9387b6c5bbbd2e363f188439430ba4b448d73
7
- data.tar.gz: ec8526f98be295fd400516bd146d650f979a67fd7e2db2abec77e3669956db453150a5b61f9c269f4dd65f74c84b9caa04a4a80bc9c568c6511322a2adf9a5a5
6
+ metadata.gz: 507344bb27cff56f279deb5b3ad90f7d2ed2325add98b986ea442334b32f4c544c75bb8c26a4f33673010572cfced609aba5572bdf865823bab70146dbd8fd42
7
+ data.tar.gz: f885e32ef9e145e5cd9bd11434f4303aeb489010b02b71ff27194286c17fdd385f25a3dbdc9175ac13d338dea8b4c4f8e8c7193aa4745df077310ccbbb3043b5
data/app/views/layouts/tenon/application.html.haml CHANGED
@@ -10,15 +10,9 @@
10
10
  = @page_title + " | " if @page_title
11
11
  = Tenon::MySettings.site_title.present? ? Tenon::MySettings.site_title : 'Tenon'
12
12
 
13
- = stylesheet_link_tag '//fonts.googleapis.com/icon?family=Material+Icons'
14
- = javascript_include_tag '/ckeditor/ckeditor'
15
- = javascript_include_tag 'tenon/application'
16
- = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js'
17
- = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.js'
18
- = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.date.js'
19
- = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.time.js'
20
- - if Rails.env.development?
21
- = javascript_include_tag 'http://localhost:9999/bundle.js'
13
+ = yield :pre_scripts
14
+ = render 'tenon/shared/assets'
15
+ = yield :post_scripts
22
16
 
23
17
  %body{data: { controller: params[:controller], action: params[:action] } }
24
18
  = flash_messages
data/app/views/tenon/shared/_assets.html.haml ADDED
@@ -0,0 +1,13 @@
1
+ = stylesheet_link_tag '//fonts.googleapis.com/icon?family=Material+Icons'
2
+ = javascript_include_tag '/ckeditor/ckeditor'
3
+ = javascript_include_tag 'tenon/application'
4
+ = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js'
5
+ = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.js'
6
+ = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.date.js'
7
+ = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.time.js'
8
+ = javascript_include_tag TENON_FRONTEND_ASSET_PATH
9
+
10
+ - # Only load separate stylesheets in production, they're included in
11
+ - # the JS in development
12
+ - if Rails.env.production?
13
+ = stylesheet_link_tag TENON_FRONTEND_ASSET_PATH
data/lib/tenon/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Tenon
2
- VERSION = '2.0.0'
2
+ VERSION = '2.0.1'
3
3
  end
data/lib/tenon.rb CHANGED
@@ -25,6 +25,6 @@ module Tenon
25
25
  class Configuration
26
26
  attr_accessor :mobile_layout, :languages, :seo_callout, :front_end,
27
27
  :after_create_path, :after_update_path, :client_color,
28
- :primary_color
28
+ :primary_color, :dev_assets
29
29
  end
30
30
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tenon
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - factor[e] design initiative
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-29 00:00:00.000000000 Z
11
+ date: 2016-05-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: capybara
@@ -599,6 +599,7 @@ files:
599
599
  - app/views/tenon/settings/show.html.haml
600
600
  - app/views/tenon/shared/_account_dropdown.html.haml
601
601
  - app/views/tenon/shared/_app_info.html.haml
602
+ - app/views/tenon/shared/_assets.html.haml
602
603
  - app/views/tenon/shared/_breadcrumbs.html.haml
603
604
  - app/views/tenon/shared/_burger.html.haml
604
605
  - app/views/tenon/shared/_default_form_toolbar.html.haml