tenon 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d39f7dfa4e24d93944c10c4ff5d70a0e0174e54f
-  data.tar.gz: db0ad6511450af0ea4fbfeb83f48efe582a2be9c
+  metadata.gz: 4f2a5900f85953634fc61739c267f51fc173794f
+  data.tar.gz: c1f20110a254097d235dd221167b50271a8cf7d1
 SHA512:
-  metadata.gz: a3e6fe7541b3a61f1803488675d28da6b49008b6ec24f6d8373cc99f6484b156c8392f524749645e9d25fd6386d9387b6c5bbbd2e363f188439430ba4b448d73
-  data.tar.gz: ec8526f98be295fd400516bd146d650f979a67fd7e2db2abec77e3669956db453150a5b61f9c269f4dd65f74c84b9caa04a4a80bc9c568c6511322a2adf9a5a5
+  metadata.gz: 507344bb27cff56f279deb5b3ad90f7d2ed2325add98b986ea442334b32f4c544c75bb8c26a4f33673010572cfced609aba5572bdf865823bab70146dbd8fd42
+  data.tar.gz: f885e32ef9e145e5cd9bd11434f4303aeb489010b02b71ff27194286c17fdd385f25a3dbdc9175ac13d338dea8b4c4f8e8c7193aa4745df077310ccbbb3043b5

data/app/views/layouts/tenon/application.html.haml

@@ -10,15 +10,9 @@
       = @page_title + " | " if @page_title
       = Tenon::MySettings.site_title.present? ? Tenon::MySettings.site_title : 'Tenon'
 
-    = stylesheet_link_tag '//fonts.googleapis.com/icon?family=Material+Icons'
-    = javascript_include_tag '/ckeditor/ckeditor'
-    = javascript_include_tag 'tenon/application'
-    = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js'
-    = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.js'
-    = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.date.js'
-    = javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.time.js'
-    - if Rails.env.development?
-      = javascript_include_tag 'http://localhost:9999/bundle.js'
+    = yield :pre_scripts
+    = render 'tenon/shared/assets'
+    = yield :post_scripts
 
   %body{data: { controller: params[:controller], action: params[:action] } }
     = flash_messages

data/app/views/tenon/shared/_assets.html.haml

@@ -0,0 +1,13 @@
+= stylesheet_link_tag '//fonts.googleapis.com/icon?family=Material+Icons'
+= javascript_include_tag '/ckeditor/ckeditor'
+= javascript_include_tag 'tenon/application'
+= javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js'
+= javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.js'
+= javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.date.js'
+= javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/pickadate.js/3.5.6/compressed/picker.time.js'
+= javascript_include_tag TENON_FRONTEND_ASSET_PATH
+
+- # Only load separate stylesheets in production, they're included in
+- # the JS in development
+- if Rails.env.production?
+  = stylesheet_link_tag TENON_FRONTEND_ASSET_PATH

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/lib/tenon.rb

@@ -25,6 +25,6 @@ module Tenon
   class Configuration
     attr_accessor :mobile_layout, :languages, :seo_callout, :front_end,
                   :after_create_path, :after_update_path, :client_color,
-                  :primary_color
+                  :primary_color, :dev_assets
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -599,6 +599,7 @@ files:
 - app/views/tenon/settings/show.html.haml
 - app/views/tenon/shared/_account_dropdown.html.haml
 - app/views/tenon/shared/_app_info.html.haml
+- app/views/tenon/shared/_assets.html.haml
 - app/views/tenon/shared/_breadcrumbs.html.haml
 - app/views/tenon/shared/_burger.html.haml
 - app/views/tenon/shared/_default_form_toolbar.html.haml