bootswatch_rails 3.2.0.28 → 3.2.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d25377ba78c1cb1b03ca7f2f102fa042280a0c
-  data.tar.gz: 52ea0223eabd5ad66b13102e91f477fe71c0876e
+  metadata.gz: ba4005850dc5bae3daadcef965e1bb1c9ca9f9a5
+  data.tar.gz: c37bd90f64b59cd11a6c9e3eb8ac2c8326106f3b
 SHA512:
-  metadata.gz: b2ef6feb88eaf070ff232d4a027aa15613a31c316004139fd21ccf92ffb8f022ba28fc5fe391dc05fb6def0ce1947e5b1d15e247f3a7dbdafa67041bf7e97419
-  data.tar.gz: a28b4ec3f5e30438173486b308437787f3259d77932a0e3e899496a43185cca1b46c108e2d2bb2a3533b5d2720c65bb2df62018ec9c7e307316955f98d7ecdfc
+  metadata.gz: 1c7ca9d42b1efa1d5e2345778e31fd5b0a718014747e96766f89e525703db425b6f1a678e157ecf79ad691f97bdab0592fc2cc16e7fecf83d38903cc21b90f3e
+  data.tar.gz: c8d2ed42e961f5fa8807198102a0ee166b2f96d1c96117c1ecefb782b3693b9a2a20c8c99a8452dd9316fa8b9ac76c412162c33f6110a0786725a59868852d0d

data/Makefile

@@ -11,15 +11,13 @@ rel: build
 	vim lib/bootswatch_rails/version.rb
 	git commit -a
 	sudo gem uninstall bootswatch_rails --all
-	rake build
 	rake release
-	sudo rake install
 
 install: build
 	git commit -a
 	sudo gem uninstall bootswatch_rails --all
-	rake build
 	sudo rake install
+	sudo rm -rf pkg
 
 build:
 	test -d cleditor && git add cleditor || true

data/lib/bootswatch_rails/version.rb

@@ -1,6 +1,6 @@
 module BootswatchRails
   BOOTSTRAP = "3.2.0"
-  VERSION = "3.2.0.28"
+  VERSION = "3.2.0.29"
 
   THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 1

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

@@ -6,8 +6,6 @@ module BootswatchRails
                desc: 'Activate turbolinks (off by default)'
       class_option :gmaps, type: :boolean, default: false,
                desc: 'Include Google Maps (requires gmaps4rails and underscore-rails)'
-      class_option :leaflet, type: :boolean, default: false,
-               desc: 'Include Leaflet JS (requires leaflet-rails and related gems)'
       source_root File.expand_path("../templates", __FILE__)
 
       def update_application_controller
@@ -49,31 +47,6 @@ module BootswatchRails
         end
       end
 
-      def add_leaflet
-        return unless options.leaflet?
-        file = "app/assets/javascripts/application.js"
-        inject_into_file file, after: /require jquery_ujs.*$/ do
-          [
-            "",
-            "//= require leaflet",
-            "//= require leaflet.makimarkers",
-            "//= require leaflet.geodesic"
-          ].join("\n")
-        end
-        file = "app/assets/stylesheets/application.css"
-        prepend_to_file file do
-          [
-            "//= depend_on_asset \"layers.png\"",
-            "//= depend_on_asset \"layers-2x.png\"",
-            "",
-            ""
-          ].join("\n")
-        end
-        inject_into_file file, after: /require_tree \..*$/ do
-          "\n *= require leaflet"
-        end
-      end
-
       def remove_turbolinks
         return if options.turbolinks?
         # comment_lines "Gemfile", /gem 'turbolinks/

data/lib/generators/bootswatch_rails/sorcery/templates/_form.html.erb

@@ -25,7 +25,7 @@
   <%%= f.input :active %>
   <%%= f.input :password %>
   <%%= f.input :password_confirmation %>
-  <%%- if current_<%= name %>.sysadmin and @<%= name %> != current_<%= name %> -%>
+  <%%- if current_<%= name %>.sysadm and @<%= name %> != current_<%= name %> -%>
     <%%= f.input :sysadm %>
   <%%- end -%>
 

data/lib/generators/bootswatch_rails/sorcery/templates/index.html.erb

@@ -40,11 +40,11 @@
         </td>
         <td class="index-actions">
           <%%= link_to t('actions.show'), <%= name %>, class: 'btn btn-default btn-xs' %>
-          <%%- if current_<%= name %>.status.to_sym == :sysadm or <%= name %> == current_<%= name %> -%>
+          <%%- if current_<%= name %>.sysadm or <%= name %> == current_<%= name %> -%>
             <br>
             <%%= link_to t('actions.edit'), [:edit, <%= name %>], class: 'btn btn-default btn-xs' %>
           <%%- end -%>
-          <%%- if current_<%= name %>.status.to_sym == :sysadm and <%= name %> != current_<%= name %> -%>
+          <%%- if current_<%= name %>.sysadm and <%= name %> != current_<%= name %> -%>
             <br>
             <%%= link_to t('actions.destroy'), <%= name %>, method: :delete, data: { confirm: t('actions.confirm') }, class: 'btn btn-danger btn-xs' %>
           <%%- end -%>

data/lib/generators/bootswatch_rails/sorcery/templates/show.html.erb

@@ -81,13 +81,13 @@
   </tbody>
 </table>
 
-<%%- if current_<%= name %>.status.to_sym == :sysadm or @<%= name %> == current_<%= name %> -%>
+<%%- if current_<%= name %>.sysadm or @<%= name %> == current_<%= name %> -%>
   <%%= link_to t('actions.edit'), [:edit, @<%= name %>], class: 'btn btn-primary' %>
   <%%= link_to t('actions.back.index'), <%= table_name %>_path, class: 'btn btn-default' %>
 <%%- else -%>
   <%%= link_to t('actions.back.index'), <%= table_name %>_path, class: 'btn btn-primary' %>
 <%%- end -%>
-<%%- if current_<%= name %>.status.to_sym == :sysadm and @<%= name %> != current_<%= name %> -%>
+<%%- if current_<%= name %>.sysadm and @<%= name %> != current_<%= name %> -%>
   <%%= link_to t('actions.destroy'), @<%= name %>, method: :delete, data: { confirm: t('actions.confirm') }, class: 'btn btn-danger' %>
 <%%- end -%>
 

data/lib/generators/bootswatch_rails/sorcery/templates/sorcery.de.yml

@@ -56,7 +56,7 @@ de:
 <%- end -%>
         theme: "Oberfläche"
         active: "Aktiv"
-        sysadm: "Admin"
+        sysadm: "SysAdmin"
         password: "Kennwort"
         password_confirmation: "Kennwort wiederholen"
 <%- if remember_me? -%>

data/lib/generators/bootswatch_rails/sorcery/templates/users_controller.rb

@@ -127,7 +127,7 @@ class <%= controller_name.camelize %> < ApplicationController
   # DELETE /<%= table_name %>/1
   # DELETE /<%= table_name %>/1.json
   def destroy
-    if @<%= name %> == current_<%= name %> or current_<%= name %>.status.to_sym != :sysadm
+    if @<%= name %> == current_<%= name %> or current_<%= name %>.sysadm
       redirect_to root_path, alert: t('sorcery.forbidden')
       return
     end

data/vendor/assets/stylesheets/darkly.css

@@ -3497,7 +3497,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
   line-height: 1;
   color: #464545;
   text-align: center;
-  background-color: #303030;
+  background-color: #464545;
   border: 1px solid transparent;
   border-radius: 4px;
 }

metadata

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