bhf 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85e5844f6e0702d76d497fa8f8acce1657e9f4c3
-  data.tar.gz: a08b7268c1284022db5abd03efcd7068253a2f6f
+  metadata.gz: 41fa77404e15a9747fc8842577826bcdb831b1c2
+  data.tar.gz: 12fb996fa607b4bb10e96f9ea5e7208b7acaeb20
 SHA512:
-  metadata.gz: 0bcd8d72a4ccd41de2ff74849c3adf2c31e85ab4efb66921226e880568fd905ddc50a5a79cde630ec28c0774f9aafc42c176228bfcd27ee10c4aa715b6ea0378
-  data.tar.gz: 3432f7a79e22c4150567c88de9fc8cbd2c85ddaef60bac95d5f41be6eee40ed2b124d7ecf42902626ea022e19329d5aa7496c666dba0dcf55055c8d138768e60
+  metadata.gz: 0045ed97911d792a3e5b0588284de54ab2d74ab04d7549d9b77373ec469acdeb72204243b1cfda21d504bd5b28050b3a3b55593e4e483d13f73342f4ec425970
+  data.tar.gz: 37a81fac11198ecc8060299dde43df7900fb4617fe83026d50e42e83ee69befc82f8d76df4580cdce3f15bcef4920f891f1fc6de1279c007502c67fe36a420f8

data/VERSION

@@ -1 +1 @@
-1.0.0.beta2
+1.0.0.beta3

data/app/assets/stylesheets/bhf/{application.css.sass → application.sass}

@@ -1,6 +1,6 @@
-@import "reset.css.sass"
-@import "typo.css.scss"
-@import "functions.css.sass"
+@import "reset.sass"
+@import "typo.scss"
+@import "functions.sass"
 
 $w1: #fff
 
@@ -869,7 +869,7 @@ input[type="submit"].alt_button,
 
 // MooEditable
 
-@import "MooEditable.css.scss"
+@import "MooEditable.scss"
 
 .mooeditable-container
   @extend .default_input

data/app/helpers/bhf/application_helper.rb

@@ -35,5 +35,9 @@ module Bhf
       Bhf.configuration.paperclip_image_types.include?(type)
     end
 
+    def main_logo(area)
+      Bhf.configuration.logo.call(area)
+    end
+
   end
 end

data/app/views/bhf/entries/_form.html.haml

@@ -22,4 +22,4 @@
           - unless @platform.hide_create
             = f.submit t('bhf.helpers.form.buttons.and_add'), name: :return_to_new, class: 'alt_button'
 
-        = link_to t('bhf.helpers.entry.cancel'), params[:return_to] ? params[:return_to] : page_path(@platform.page_name), class: 'cancel', data: ( {no_turbolink: true} if params[:return_to])
+        = link_to t('bhf.helpers.entry.cancel'), (params[:return_to] ? params[:return_to] : page_path(@platform.page_name)), class: 'cancel', data: ({turbolinks: false} if params[:return_to])

data/app/views/layouts/bhf/application.haml

@@ -15,12 +15,9 @@
     = render partial: 'bhf/helper/flash', locals: {flash: flash}
     %header
       %h1
-        - logo = if params[:bhf_area]
-          - "logo_#{params[:bhf_area]}_bhf.svg"
-        - else
-          - 'logo_bhf.svg'
+        - logo = main_logo(params[:bhf_area])
 
-        = link_to image_tag(logo), @root_link ? @root_link : main_app.root_url, data: {no_turbolink: true}
+        = link_to image_tag(logo), @root_link ? @root_link : main_app.root_url, data: {turbolinks: false}
 
       - if @areas && @areas.length > 1
         = select_tag :area_select, options_from_collection_for_select(@areas, 'path', 'name', main_app.bhf_path(params[:bhf_area])), class: 'icon'

data/bhf.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bhf 1.0.0.beta2 ruby lib
+# stub: bhf 1.0.0.beta3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf".freeze
-  s.version = "1.0.0.beta2"
+  s.version = "1.0.0.beta3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Anton Pawlik".freeze]
-  s.date = "2018-05-07"
+  s.date = "2018-05-10"
   s.description = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord and Mongoid.".freeze
   s.email = "anton.pawlik@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -27,13 +27,13 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/assets/images/bhf/ajax_loader.gif",
     "app/assets/images/bhf/bg.png",
+    "app/assets/images/bhf/logo_bhf.svg",
     "app/assets/images/bhf/mooeditable-toolbarbuttons-tango.png",
     "app/assets/images/bhf/pictos.png",
     "app/assets/images/bhf/pictos_2x.png",
     "app/assets/images/bhf/small_ajax_loader.gif",
     "app/assets/images/bhf/small_ajax_loader_h.gif",
     "app/assets/images/bhf/wmd-buttons.png",
-    "app/assets/images/logo_bhf.svg",
     "app/assets/javascripts/bhf/application.js",
     "app/assets/javascripts/bhf/classes/Ajaxify.js",
     "app/assets/javascripts/bhf/classes/ArrayFields.js",
@@ -56,11 +56,11 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/bhf/mootools-core-1.5.0-full-compat.js",
     "app/assets/javascripts/bhf/mootools-more-1.5.0.js",
     "app/assets/javascripts/bhf/mootools_ujs.js",
-    "app/assets/stylesheets/bhf/MooEditable.css.scss",
-    "app/assets/stylesheets/bhf/application.css.sass",
-    "app/assets/stylesheets/bhf/functions.css.sass",
-    "app/assets/stylesheets/bhf/reset.css.sass",
-    "app/assets/stylesheets/bhf/typo.css.scss",
+    "app/assets/stylesheets/bhf/MooEditable.scss",
+    "app/assets/stylesheets/bhf/application.sass",
+    "app/assets/stylesheets/bhf/functions.sass",
+    "app/assets/stylesheets/bhf/reset.sass",
+    "app/assets/stylesheets/bhf/typo.scss",
     "app/controllers/bhf/application_controller.rb",
     "app/controllers/bhf/embed_entries_controller.rb",
     "app/controllers/bhf/entries_controller.rb",

data/config/locales/de.yml

@@ -1,5 +1,8 @@
 de:
   bhf:
+    page_title: "%{title} – Admin"
+    areas:
+      page_title: "%{area} – %{title} – Admin"
     helpers:
       boolean:
         'true': 'ja'
@@ -70,6 +73,9 @@ de:
       copy: 'Gemacht von <a href="http://twitter.com/antpaw">@antpaw</a>'
       info: 'Mehr Informationen auf <a href="http://antpaw.github.io/bhf">GitHub</a>'
 
+  attributes:
+    _id: 'id'
+
   activerecord:
     notices:
       messages:

data/lib/bhf.rb

@@ -22,6 +22,10 @@ module Bhf
         include Bhf::Mongoid::Document
       end
     end
+
+    initializer 'bhf.assets.precompile' do |app|
+      app.config.assets.precompile += %w( bhf/logo_bhf.svg )
+    end
   end
 
 
@@ -34,6 +38,7 @@ module Bhf
   class Configuration
     include ActiveSupport::Configurable
 
+    config_accessor(:logo)                      { lambda { |area| 'bhf/logo_bhf.svg' }}
     config_accessor(:on_login_fail)             { :root_url           }
     config_accessor(:logout_path)               { :logout_path        }
     config_accessor(:session_auth_name)         { :is_admin           }

data/lib/rails/generators/bhf/templates/initializer.rb

@@ -3,6 +3,7 @@ Bhf.configure do |config|
   # config.js << 'bhf'
   # config.abstract_settings << 'abstract'
 
+  # config.logo = lambda { |area| 'my_logo.svg' }
   # config.on_login_fail = :root_url
   # config.logout_path = :logout_path
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,13 +168,13 @@ files:
 - VERSION
 - app/assets/images/bhf/ajax_loader.gif
 - app/assets/images/bhf/bg.png
+- app/assets/images/bhf/logo_bhf.svg
 - app/assets/images/bhf/mooeditable-toolbarbuttons-tango.png
 - app/assets/images/bhf/pictos.png
 - app/assets/images/bhf/pictos_2x.png
 - app/assets/images/bhf/small_ajax_loader.gif
 - app/assets/images/bhf/small_ajax_loader_h.gif
 - app/assets/images/bhf/wmd-buttons.png
-- app/assets/images/logo_bhf.svg
 - app/assets/javascripts/bhf/application.js
 - app/assets/javascripts/bhf/classes/Ajaxify.js
 - app/assets/javascripts/bhf/classes/ArrayFields.js
@@ -197,11 +197,11 @@ files:
 - app/assets/javascripts/bhf/mootools-core-1.5.0-full-compat.js
 - app/assets/javascripts/bhf/mootools-more-1.5.0.js
 - app/assets/javascripts/bhf/mootools_ujs.js
-- app/assets/stylesheets/bhf/MooEditable.css.scss
-- app/assets/stylesheets/bhf/application.css.sass
-- app/assets/stylesheets/bhf/functions.css.sass
-- app/assets/stylesheets/bhf/reset.css.sass
-- app/assets/stylesheets/bhf/typo.css.scss
+- app/assets/stylesheets/bhf/MooEditable.scss
+- app/assets/stylesheets/bhf/application.sass
+- app/assets/stylesheets/bhf/functions.sass
+- app/assets/stylesheets/bhf/reset.sass
+- app/assets/stylesheets/bhf/typo.scss
 - app/controllers/bhf/application_controller.rb
 - app/controllers/bhf/embed_entries_controller.rb
 - app/controllers/bhf/entries_controller.rb