bootswatch_rails 3.2.0.32 → 3.2.0.33

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8b3f3116cd4be49d21e10a1e31ebe32df1b86794
4
- data.tar.gz: 27dc9db0aade8d1995aaca9c632e2327947efa2b
3
+ metadata.gz: 4773bcd616609782472a683efee64e5db8f92989
4
+ data.tar.gz: b985c56427dd68603366fc51685b99b03de851f2
5
5
  SHA512:
6
- metadata.gz: fe80df1336061e2b2b3f1e60ef9d3c6476580ac59080051849914c8c49dd9e585f6afbb0bf1446b0facf3d21a2577036f2a5fd15affc23b98d0738c3e1ea7b70
7
- data.tar.gz: 10f142dd01fabf4e12885670bd977939aef2730592ce06e4a6cd44d00a53ac25f1f2039b9acccef73b87f048be7e8dd6b4df9e305750a7a3cbc000d39eb35b96
6
+ metadata.gz: bbb8e5d2b303a86aaeacadf1744ab664ba8c7f16fad81a438685e59da389e285437273384c895bc9579de59b96b49cc66060e98b7aad56b72d815624f908bebd
7
+ data.tar.gz: 58b0224470162fb97ef7e4ebdb85594466ac7583c92bd1570ad28a2e7cce20284522c3f50bfd99dc77f350455463ddf1eb091ad2859e5e8837e6ab28533a79ec
@@ -1,11 +1,8 @@
1
1
  module BootswatchRails
2
2
  BOOTSTRAP = "3.2.0"
3
- VERSION = "3.2.0.32"
3
+ VERSION = "3.2.0.33"
4
+ FONT_AWESOME = "4.2.0"
4
5
 
5
6
  THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
6
7
  DEFAULT = 1
7
-
8
- GMAPS_API_STATIC = "//maps.google.com/maps/api/js?v=3.13&sensor=false&libraries=geometry"
9
- GMAPS_API_MOBILE = "//maps.google.com/maps/api/js?v=3.13&sensor=true&libraries=geometry"
10
- GMAPS_UTIL_MARKER = "//google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.14/src/markerclusterer_packed.js"
11
8
  end
@@ -4,8 +4,6 @@ module BootswatchRails
4
4
  desc "Setup application to use bootswatch.com"
5
5
  class_option :turbolinks, type: :boolean, default: false,
6
6
  desc: 'Activate turbolinks (off by default)'
7
- class_option :gmaps, type: :boolean, default: false,
8
- desc: 'Include Google Maps (requires gmaps4rails and underscore-rails)'
9
7
  source_root File.expand_path("../templates", __FILE__)
10
8
 
11
9
  def update_application_controller
@@ -38,15 +36,6 @@ module BootswatchRails
38
36
  template "head.html.erb", "app/views/layouts/_head.html.erb"
39
37
  end
40
38
 
41
- def add_gmaps
42
- return unless options.gmaps?
43
- file = "app/assets/javascripts/application.js"
44
- inject_into_file file, after: /require jquery_ujs.*$/ do
45
- "\n//= require underscore" +
46
- "\n//= require gmaps/google"
47
- end
48
- end
49
-
50
39
  def remove_turbolinks
51
40
  return if options.turbolinks?
52
41
  # comment_lines "Gemfile", /gem 'turbolinks/
@@ -7,7 +7,7 @@
7
7
  <span class="icon-bar"></span>
8
8
  <span class="icon-bar"></span>
9
9
  </button>
10
- <%- if brand_logo.present? -%>
10
+ <%- if brand_logo -%>
11
11
  <%= link_to brand_logo, copyright_link, class: "navbar-brand" %>
12
12
  <%- end -%>
13
13
  </div>
@@ -7,7 +7,7 @@
7
7
 
8
8
  <div class="container" id="main-content">
9
9
  <div class="row">
10
- <%- if current_user.present? -%>
10
+ <%- if current_user -%>
11
11
  <div class="col-md-9">
12
12
  <%= render 'layouts/flash' %>
13
13
  <%= yield %>
@@ -1,14 +1,14 @@
1
1
  de:
2
2
  navigation:
3
3
  toggle: "Navigation umschalten"
4
-
4
+
5
5
  headers:
6
6
  index: "%{name} auflisten"
7
7
  show: "%{name} anzeigen"
8
8
  new: "%{name} hinzufügen"
9
9
  edit: "%{name} bearbeiten"
10
10
  destroy: "%{name} löschen"
11
-
11
+
12
12
  actions:
13
13
  title: "Aktion"
14
14
  create: "Hinzufügen"
@@ -20,8 +20,14 @@ de:
20
20
  index: "Zurück zum Auflisten"
21
21
  show: "Zurück zum Anzeigen"
22
22
  add: "%{name} hinzufügen"
23
-
23
+
24
24
  results:
25
25
  created: "%{name} wurde erstellt."
26
26
  updated: "%{name} wurde aktualisiert."
27
27
  deleted: "%{name} wurde gelöscht."
28
+
29
+ activerecord:
30
+ attributes:
31
+ created_by: "Angelegt"
32
+ updated_by: "Aktualisiert"
33
+
@@ -1,14 +1,14 @@
1
1
  en:
2
2
  navigation:
3
3
  toggle: "Toggle navigation"
4
-
4
+
5
5
  headers:
6
6
  index: "Listing %{name}"
7
7
  show: "Showing %{name}"
8
8
  new: "Adding %{name}"
9
9
  edit: "Editing %{name}"
10
10
  destroy: "Deleting %{name}"
11
-
11
+
12
12
  actions:
13
13
  title: "Action"
14
14
  create: "Add"
@@ -20,8 +20,14 @@ en:
20
20
  index: "Back to listing"
21
21
  show: "Back to showing"
22
22
  add: "Add %{name}"
23
-
23
+
24
24
  results:
25
25
  created: "%{name} created."
26
26
  updated: "%{name} updated."
27
27
  deleted: "%{name} deleted."
28
+
29
+ activerecord:
30
+ attributes:
31
+ created_by: "Created"
32
+ updated_by: "Updated"
33
+
@@ -4,40 +4,16 @@
4
4
 
5
5
  <title><%%= content_for?(:title) ? yield(:title) : app_name %></title>
6
6
 
7
- <%- if options.gmaps? -%>
8
- <script src="<%= BootswatchRails::GMAPS_API_STATIC %>"></script>
9
- <script src="<%= BootswatchRails::GMAPS_UTIL_MARKER %>"></script>
10
- <%- end -%>
11
- <%%- if content_for?(:head_common_pre) -%>
12
- <%%= yield(:head_common_pre) %>
13
- <%%- end -%>
14
-
15
7
  <%%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
16
8
  <%%- if Rails.env.production? -%>
17
- <%%- if content_for?(:head_production_pre) -%>
18
- <%%= yield(:head_production_pre) %>
19
- <%%- end -%>
20
9
  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootswatch/<%= BootswatchRails::BOOTSTRAP %>/<%%= current_theme %>/bootstrap.min.css">
21
- <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css">
10
+ <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/<%= BootswatchRails::FONT_AWESOME %>/css/font-awesome.min.css">
22
11
  <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
23
12
  <script src="//maxcdn.bootstrapcdn.com/bootstrap/<%= BootswatchRails::BOOTSTRAP %>/js/bootstrap.min.js"></script>
24
- <%%- if content_for?(:head_production_post) -%>
25
- <%%= yield(:head_production_post) %>
26
- <%%- end -%>
27
13
  <%%- else -%>
28
- <%%- if content_for?(:head_development_pre) -%>
29
- <%%= yield(:head_development_pre) %>
30
- <%%- end -%>
31
14
  <%%= stylesheet_link_tag current_theme, 'data-turbolinks-track' => true %>
32
15
  <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
33
16
  <%%= javascript_include_tag 'bootstrap', 'data-turbolinks-track' => true %>
34
- <%%- if content_for?(:head_development_post) -%>
35
- <%%= yield(:head_development_post) %>
36
- <%%- end -%>
37
- <%%- end -%>
38
-
39
- <%%- if content_for?(:head_common_post) -%>
40
- <%%= yield(:head_common_post) %>
41
17
  <%%- end -%>
42
18
 
43
19
  <!--[if lt IE 9]>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootswatch_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.0.32
4
+ version: 3.2.0.33
5
5
  platform: ruby
6
6
  authors:
7
7
  - Volker Wiegand
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-20 00:00:00.000000000 Z
11
+ date: 2014-10-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties