bhf 0.7.0.rc3 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36b6cbfef7e6bd75713e819daa01085e321f93bf
-  data.tar.gz: 60e9cda045dca7d4dc80b1479a8564ee380e94fc
+  metadata.gz: aeb67ca0285c67ab14c38924a9155bb202501b5b
+  data.tar.gz: cdaabaadf3e5efcd91d5a4064e76895fa2db1f64
 SHA512:
-  metadata.gz: f1a94e9739d4e96c20111bc5b6176f515b9b59850aa78fe8398f1ecdde3a7a56a5dd4efddd6864116eed3076557ddd6ee84e2b28ce6a3609723932a2725fb568
-  data.tar.gz: 040cfc96340a581e5d234a2509b0396ac10b3987f6f144894ccbaef430aad9dd95b9149a4132b64f675f50c8f8dc782e758c5ff2832ac86fbf0b2aa6a289bbfb
+  metadata.gz: 3881d098482897fd0d275067eff3820e4365516c3563e1cda9215a4e0874d6e6fe40d6ffe91e1cd284acbdd09f0eba66eb98f4b3e85bae11b2a1fe3bbda4ea57
+  data.tar.gz: 9ba56eea1635a5655f812ca33c9882a6a888a935aef98303f7bae1602831e8969f74a7e1cfca0841708fd078f016f054eb97339f4bd4bd28c54d9249277a9764

data/app/controllers/bhf/application_controller.rb

@@ -57,7 +57,23 @@ class Bhf::ApplicationController < ActionController::Base
 
     def set_title
       @app_title = Rails.application.class.to_s.split('::').first
-      @title = Bhf::Engine.config.page_title || ("#{@app_title} &ndash; Admin").html_safe
+      # TODO: add area i18ned title
+      @title = if Bhf::Engine.config.page_title
+        Bhf::Engine.config.page_title
+      else
+        if params[:bhf_area]
+          t("bhf.areas.page_title.#{params[:bhf_area]}", 
+            area: params[:bhf_area],
+            title: @app_title,
+            default: t('bhf.areas.default_page_title', 
+              title: @app_title,
+              area: t("bhf.areas.links.#{params[:bhf_area]}", default: params[:bhf_area])
+            )
+          )
+        else
+          t('bhf.default_page_title', title: @app_title)
+        end
+      end.html_safe
     end
     
     def set_areas

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

@@ -10,8 +10,12 @@
     %header
       
       %h1
-        - logo = Rails.application.assets.find_asset('logo_bhf.png') ? 'logo_bhf.png' : 'logo_bhf.svg'
-        = link_to image_tag(asset_path(logo)), main_app.root_url, :'data-no-turbolink' => true
+        - logo = if params[:bhf_area] && Rails.application.assets.find_asset("logo_#{params[:bhf_area]}_bhf.svg")
+          - "logo_#{params[:bhf_area]}_bhf.svg"
+        - else
+          - Rails.application.assets.find_asset('logo_bhf.png') ? 'logo_bhf.png' : 'logo_bhf.svg'
+        
+        = link_to image_tag(logo), main_app.root_url, :'data-no-turbolink' => true
 
       - if @areas and @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/config/locales/en.yml

@@ -1,5 +1,8 @@
 en:  
   bhf:
+    default_page_title: "%{title} – Admin"
+    areas:
+      default_page_title: "%{area} – %{title} – Admin"
     helpers:
       boolean:
         a: yes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.7.0.rc3
+  version: 0.7.1
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -228,9 +228,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 2.2.1