bootswatch_rails 3.2.0.32 → 3.2.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b3f3116cd4be49d21e10a1e31ebe32df1b86794
-  data.tar.gz: 27dc9db0aade8d1995aaca9c632e2327947efa2b
+  metadata.gz: 4773bcd616609782472a683efee64e5db8f92989
+  data.tar.gz: b985c56427dd68603366fc51685b99b03de851f2
 SHA512:
-  metadata.gz: fe80df1336061e2b2b3f1e60ef9d3c6476580ac59080051849914c8c49dd9e585f6afbb0bf1446b0facf3d21a2577036f2a5fd15affc23b98d0738c3e1ea7b70
-  data.tar.gz: 10f142dd01fabf4e12885670bd977939aef2730592ce06e4a6cd44d00a53ac25f1f2039b9acccef73b87f048be7e8dd6b4df9e305750a7a3cbc000d39eb35b96
+  metadata.gz: bbb8e5d2b303a86aaeacadf1744ab664ba8c7f16fad81a438685e59da389e285437273384c895bc9579de59b96b49cc66060e98b7aad56b72d815624f908bebd
+  data.tar.gz: 58b0224470162fb97ef7e4ebdb85594466ac7583c92bd1570ad28a2e7cce20284522c3f50bfd99dc77f350455463ddf1eb091ad2859e5e8837e6ab28533a79ec

data/lib/bootswatch_rails/version.rb

@@ -1,11 +1,8 @@
 module BootswatchRails
   BOOTSTRAP = "3.2.0"
-  VERSION = "3.2.0.32"
+  VERSION = "3.2.0.33"
+  FONT_AWESOME = "4.2.0"
 
   THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 1
-
-  GMAPS_API_STATIC = "//maps.google.com/maps/api/js?v=3.13&sensor=false&libraries=geometry"
-  GMAPS_API_MOBILE = "//maps.google.com/maps/api/js?v=3.13&sensor=true&libraries=geometry"
-  GMAPS_UTIL_MARKER = "//google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.14/src/markerclusterer_packed.js"
 end

data/lib/generators/bootswatch_rails/install/install_generator.rb

@@ -4,8 +4,6 @@ module BootswatchRails
       desc "Setup application to use bootswatch.com"
       class_option :turbolinks, type: :boolean, default: false,
                desc: 'Activate turbolinks (off by default)'
-      class_option :gmaps, type: :boolean, default: false,
-               desc: 'Include Google Maps (requires gmaps4rails and underscore-rails)'
       source_root File.expand_path("../templates", __FILE__)
 
       def update_application_controller
@@ -38,15 +36,6 @@ module BootswatchRails
         template "head.html.erb", "app/views/layouts/_head.html.erb"
       end
 
-      def add_gmaps
-        return unless options.gmaps?
-        file = "app/assets/javascripts/application.js"
-        inject_into_file file, after: /require jquery_ujs.*$/ do
-          "\n//= require underscore" +
-          "\n//= require gmaps/google"
-        end
-      end
-
       def remove_turbolinks
         return if options.turbolinks?
         # comment_lines "Gemfile", /gem 'turbolinks/

data/lib/generators/bootswatch_rails/install/templates/app/views/layouts/_topnav.html.erb

@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-<%- if brand_logo.present? -%>
+<%- if brand_logo -%>
       <%= link_to brand_logo, copyright_link, class: "navbar-brand" %>
 <%- end -%>
     </div>

data/lib/generators/bootswatch_rails/install/templates/app/views/layouts/application.html.erb

@@ -7,7 +7,7 @@
 
     <div class="container" id="main-content">
       <div class="row">
-<%- if current_user.present? -%>
+<%- if current_user -%>
         <div class="col-md-9">
           <%= render 'layouts/flash' %>
           <%= yield %>

data/lib/generators/bootswatch_rails/install/templates/config/locales/scaffold.de.yml

@@ -1,14 +1,14 @@
 de:
   navigation:
     toggle: "Navigation umschalten"
-    
+
   headers:
     index: "%{name} auflisten"
     show: "%{name} anzeigen"
     new: "%{name} hinzufügen"
     edit: "%{name} bearbeiten"
     destroy: "%{name} löschen"
-    
+
   actions:
     title: "Aktion"
     create: "Hinzufügen"
@@ -20,8 +20,14 @@ de:
       index: "Zurück zum Auflisten"
       show: "Zurück zum Anzeigen"
     add: "%{name} hinzufügen"
-    
+
   results:
     created: "%{name} wurde erstellt."
     updated: "%{name} wurde aktualisiert."
     deleted: "%{name} wurde gelöscht."
+
+  activerecord:
+    attributes:
+      created_by: "Angelegt"
+      updated_by: "Aktualisiert"
+

data/lib/generators/bootswatch_rails/install/templates/config/locales/scaffold.en.yml

@@ -1,14 +1,14 @@
 en:
   navigation:
     toggle: "Toggle navigation"
-    
+
   headers:
     index: "Listing %{name}"
     show: "Showing %{name}"
     new: "Adding %{name}"
     edit: "Editing %{name}"
     destroy: "Deleting %{name}"
-    
+
   actions:
     title: "Action"
     create: "Add"
@@ -20,8 +20,14 @@ en:
       index: "Back to listing"
       show: "Back to showing"
     add: "Add %{name}"
-    
+
   results:
     created: "%{name} created."
     updated: "%{name} updated."
     deleted: "%{name} deleted."
+
+  activerecord:
+    attributes:
+      created_by: "Created"
+      updated_by: "Updated"
+

data/lib/generators/bootswatch_rails/install/templates/head.html.erb

@@ -4,40 +4,16 @@
 
   <title><%%= content_for?(:title) ? yield(:title) : app_name %></title>
 
-<%- if options.gmaps? -%>
-  <script src="<%= BootswatchRails::GMAPS_API_STATIC %>"></script>
-  <script src="<%= BootswatchRails::GMAPS_UTIL_MARKER %>"></script>
-<%- end -%>
-<%%- if content_for?(:head_common_pre) -%>
-  <%%= yield(:head_common_pre) %>
-<%%- end -%>
-
   <%%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
 <%%- if Rails.env.production? -%>
-  <%%- if content_for?(:head_production_pre) -%>
-    <%%= yield(:head_production_pre) %>
-  <%%- end -%>
   <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootswatch/<%= BootswatchRails::BOOTSTRAP %>/<%%= current_theme %>/bootstrap.min.css">
-  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css">
+  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/<%= BootswatchRails::FONT_AWESOME %>/css/font-awesome.min.css">
   <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <script src="//maxcdn.bootstrapcdn.com/bootstrap/<%= BootswatchRails::BOOTSTRAP %>/js/bootstrap.min.js"></script>
-  <%%- if content_for?(:head_production_post) -%>
-    <%%= yield(:head_production_post) %>
-  <%%- end -%>
 <%%- else -%>
-  <%%- if content_for?(:head_development_pre) -%>
-    <%%= yield(:head_development_pre) %>
-  <%%- end -%>
   <%%= stylesheet_link_tag current_theme, 'data-turbolinks-track' => true %>
   <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%%= javascript_include_tag 'bootstrap', 'data-turbolinks-track' => true %>
-  <%%- if content_for?(:head_development_post) -%>
-    <%%= yield(:head_development_post) %>
-  <%%- end -%>
-<%%- end -%>
-
-<%%- if content_for?(:head_common_post) -%>
-  <%%= yield(:head_common_post) %>
 <%%- end -%>
 
   <!--[if lt IE 9]>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0.32
+  version: 3.2.0.33
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties