weeler 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 510bfeea734279d6a69e655c195b32f36732ddf4
-  data.tar.gz: f249eca43957610f851a1f85263b9524170a257b
+  metadata.gz: 5d993ac60b9d9f338a01a5c51836b905e86928e0
+  data.tar.gz: 015863705f2c4761a02ff6cecb710d2e36f3e2e7
 SHA512:
-  metadata.gz: f752d4521e6ebe92f7d3e8ad9cad210776619bde701dd631146dca914a1ea9069646656f6da3e5ffa2464e24389f7e320aa9e55d3453ce01225898848712f5ba
-  data.tar.gz: 04b1046910eb5267d4744c503abb203bbe3c052c379223416587bd4b29e06077e5f9dbe1b1595001138263804cb795bd98787d1a3afee8baa0a8e61cae090829
+  metadata.gz: 85b6eeb35a6054b99706961f0276bd2836b763102962b2808f3119824d4a1d6eaad5af890d4c6fb5b1fdcc9c4a911dcf7ed6b10e4ddd8804992005e564d13bba
+  data.tar.gz: dd7a5a7c0956b906cb8ae3eb9d53b1eedd91c284500f8a95f78704eae0c899b3ed67add13b787153f332383d9debc63d17c340092fb12795a24f47bbe76d2535

data/CHANGELOG.md

@@ -1,10 +1,22 @@
+## 1.0.2
+
+### Bug Fixes
+
+* Require jquery turbolinks
+* Update dependencies
+* Using boostrap flash instead jquery notify
+
+### Contributors
+
+* Arturs Braucs
+
 ## 1.0.1
 
 ### Bug Fixes
 
 * Fixed turbo links not workin
 * Fixed seo translation wrong locale
-* Fixed empty image with image_upload_field 
+* Fixed empty image with image_upload_field
 
 ### Contributors
 

data/app/assets/javascripts/weeler/init.js.coffee

@@ -12,9 +12,10 @@ app = {
   boot: () ->
     $('.weeler-file-inputs').bootstrapFileInput()
     sortable.init()
+    flash.init();
     $('[data-provide="rowlink"],[data-provides="rowlink"]').each () ->
       $(this).rowlink($(this).data())
 }
 
 $(document).ready () ->
-  app.boot()
+  app.boot()

data/app/assets/javascripts/weeler/lib/flash.js

@@ -0,0 +1,7 @@
+var flash = {
+  init: function() {
+    $(".flash").fadeTo(4000, 6000).slideUp(500, function(){
+      $(".flash").alert('close');
+    });
+  }
+}

data/app/helpers/weeler/flash_helper.rb

@@ -0,0 +1,12 @@
+module Weeler
+  module FlashHelper
+    def alert_class_for(flash_type)
+      {
+        :success => 'alert-success',
+        :error => 'alert-danger',
+        :alert => 'alert-warning',
+        :notice => 'alert-info'
+      }[flash_type.to_sym] || "alert-info"
+    end
+  end
+end

data/app/views/layouts/weeler/base.html.haml

@@ -13,10 +13,10 @@
   %body{data: {controller: controller_name, action: action_name, name_space: 'weeler', tag: "#{yield :weeler_body_tag}" }}
     = render "header_navbar"
     .container
+      = render "flash"
       .row.row-offcanvas.row-offcanvas-right
         = render "side_navbar"
         .col-xs-12.col-sm-9
           = yield
         %hr
         = render "footer"
-      = render "flash"

data/app/views/weeler/base/_flash.html.haml

@@ -1,3 +1,8 @@
-- flash.each do |name, message|
-  :javascript
-    notify.show("#{name}", "#{message}");
+.row
+  .col-xs-12.col-sm-12.col-md-12.col-lg-12
+    - flash.each do |type, message|
+      .flash.alert.alert-dismissible{:role => "alert", class: "#{alert_class_for(type)}"}
+        %button.close{"data-dismiss" => "alert", :type => "button"}
+          %span{"aria-hidden" => "true"} ×
+          %span.sr-only= t('general.close')
+        = raw message

data/lib/weeler/version.rb

@@ -2,7 +2,7 @@ module Weeler
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/weeler.rb

@@ -11,6 +11,7 @@ require "haml"
 require "kaminari"
 require "globalize"
 require "jquery-ui-rails"
+require "jquery-turbolinks"
 require "rails-settings-cached"
 
 module Weeler