eu_cookies 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca09d0afc0c3cd1576476fadba579ed735f0e45
-  data.tar.gz: f45f86a490319eaa012752c85650b69e7984e858
+  metadata.gz: 3fa48eb9dac60abf79394dc56ecc86f61c431c3f
+  data.tar.gz: f85fb2bca6de16291aaa8c4d36a22dadcdf14d09
 SHA512:
-  metadata.gz: 9831d7c7252b272b84280a861981d31cacb402a13fc318f9882dd6939390f0d7b288361feb98ff6259afbc8b1cd056abce57d434c27615c4d6c8ca7f88c84291
-  data.tar.gz: 12288284d95a073bc4167cb65ef5ba402db71e006a16092dd27d9738068c98ebc99799cd5c907191b047cc4886d00e62063f07bfd8a6df8635265f836f236cf5
+  metadata.gz: ed3a6760164fd7ceace7a831d31ec8f0231bb1e1a0df77b80cebd5aa8e2e0d485240ce370a473ad468380847924bbd24162161efd6b06b050e08ad44bb51939d
+  data.tar.gz: fc8f4f919052b087a815e19221e80c6b82f8e6e5c96976bce55eb3a1b13d250c27c887d32f8fdf6cc2e40a78f7df240e40c036173fbe8901bea5b16b3c04ed68

data/README.md

@@ -2,8 +2,7 @@
 
 A Rails solution to the European Cookie Law issue.
 
-This will add a dismissable "cookies bar" and a `/cookies-policy` page with the
-long cookies policy text.
+This will add a dismissable "cookies bar" and an optional link to a policy page.
 
 [![Build Status](https://travis-ci.org/freego/eu_cookies.svg)](https://travis-ci.org/freego/eu_cookies)
 [![Code Climate](https://codeclimate.com/github/freego/eu_cookies/badges/gpa.svg)](https://codeclimate.com/github/freego/eu_cookies)
@@ -13,7 +12,7 @@ long cookies policy text.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'eu_cookies', "~> 1.0"
+gem 'eu_cookies', "~> 1.1.0"
 ```
 
 And then execute:
@@ -34,12 +33,15 @@ NOTE: This gem imply that you have JQuery.
 
 ## Configuration
 
-On a initializer you can configure things (defaults are shown here):
+On a initializer you can configure some things (defaults are shown here):
 
 ```ruby
-EuCookies.use_scroll = false # true to treat page scroll as acceptance
-EuCookies.display_policy = true # false to remove link, a string to link an external policy
-EuCookies.enabled = true # false to disable all the features
+# false to remove the default internal link, a string to link an external page
+EuCookies.display_policy = true
+# true to treat page scroll as acceptance
+EuCookies.use_scroll = false
+# false to disable all the features
+EuCookies.enabled = true
 ```
 
 ## Styling
@@ -49,9 +51,11 @@ take a look to your `app/assets/stylesheets/eu_cookies.scss` file.
 
 ## Supported languages
 
-The short cookies bar message is available in English, Croatian, Dutch, Estonian,
+The cookies bar message is available in English, Croatian, Dutch, Estonian,
 French, German, Italian, Norwegian, Polish, Russian, Slovenian, Spanish and Swedish.
 
+The full policy page is currently in english.
+
 ## Turbolinks
 
 Not supported, please use [jquery.turbolinks gem](https://github.com/kossnocorp/jquery.turbolinks).

data/app/assets/stylesheets/eu_cookies/_variables.scss

@@ -1,8 +1,7 @@
 $cookies-bar-position:         bottom !default; // or top
 $cookies-bar-background-color: #f2f2f2 !default;
-$cookies-bar-border-color:     #e4e4e4 !default;
-$cookies-bar-btn-color:        #4d90fe !default;
-$cookies-bar-btn-color2:       #4787ed !default;
-$cookies-bar-btn-border-color: #3079ed !default;
-
+$cookies-bar-text-color:       #333333 !default;
+$cookies-bar-link-color:       $cookies-bar-text-color !default;
+$cookies-bar-btn-color:        #777777 !default;
+$cookies-bar-btn-text-color:   #ffffff !default;
 $cookies-bar-line-height:      40px !default;

data/app/assets/stylesheets/eu_cookies/style.css.scss

@@ -4,34 +4,39 @@
   position: fixed;
   left: 0;
   #{$cookies-bar-position}: 0;
+  color: $cookies-bar-text-color;
   line-height: $cookies-bar-line-height;
   background: $cookies-bar-background-color;
-  border-top: 1px solid $cookies-bar-border-color;
+  border-top: 1px solid darken($cookies-bar-background-color, 10%);
+  border-bottom: 1px solid darken($cookies-bar-background-color, 10%);
   width: 100%;
   z-index: 999;
   text-align: center;
 
   .eu-cookies-content-holder {
     display: inline-block;
-    padding: 0 20px;
+    padding: 0 10px;
     line-height: 26px;
+
+    .eu-cookies-link {
+      color: $cookies-bar-link-color;
+    }
   }
+
   .eu-cookies-button-holder {
     display: inline-block;
     padding-right: 20px;
 
     .eu-cookies-ok {
       background-color: $cookies-bar-btn-color;
-      background-image: -webkit-linear-gradient(top, $cookies-bar-btn-color, $cookies-bar-btn-color2);
-      border: 1px solid $cookies-bar-btn-border-color;
+      border: 1px solid $cookies-bar-btn-color;
       border-radius: 2px;
-      color: #fff;
-      cursor: default;
+      color: $cookies-bar-btn-text-color;
       display: inline-block;
       font-size: 11px;
       font-weight: bold;
       height: 24px;
-      line-height: 20px;
+      line-height: 21px;
       margin-right: 0px;
       min-width: 26px;
       outline: 0;

data/app/helpers/eu_cookies_helper.rb

@@ -20,6 +20,10 @@ module EuCookiesHelper
   end
 
   def cookies_policy_link
-    EuCookies.display_policy == true ? cookies_policy_path : EuCookies.display_policy
+    if EuCookies.display_policy == true
+      main_app.cookies_policy_path
+    else
+      EuCookies.display_policy
+    end
   end
 end

data/app/views/eu_cookies/_cookies_bar.html.erb

@@ -1,13 +1,16 @@
 <%= content_tag :div, class: "eu-cookies", data: cookies_bar_data do %>
   <span class="eu-cookies-content-holder">
     <%= t('eu_cookies.short_html') %>
+
+    <% if display_cookies_policy? %>
+      <%= link_to t('eu_cookies.learn_more'), cookies_policy_link,
+                  class: 'eu-cookies-link', target: "_blank" %>
+    <% end %>
   </span>
+
   <span class="eu-cookies-button-holder">
-    <button class="eu-cookies-ok">
+    <a class="eu-cookies-ok" href="#">
       <%= t('eu_cookies.ok') %>
-    </button>
-
-    <%= link_to t('eu_cookies.learn_more'), cookies_policy_link,
-                class: 'eu-cookies-link', target: "_blank" if display_cookies_policy? %>
+    </a>
   </span>
 <% end %>

data/lib/eu_cookies/version.rb

@@ -1,3 +1,3 @@
 module EuCookies
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/lib/generators/eu_cookies/install/templates/eu_cookies.scss

@@ -2,11 +2,10 @@
 
 // $cookies-bar-position:         bottom; // or top
 // $cookies-bar-background-color: #f2f2f2;
-// $cookies-bar-border-color:     #e4e4e4;
-// $cookies-bar-btn-color:        #4d90fe;
-// $cookies-bar-btn-color2:       #4787ed;
-// $cookies-bar-btn-border-color: #3079ed;
-
+// $cookies-bar-text-color:       #333333;
+// $cookies-bar-link-color:       $cookies-bar-text-color;
+// $cookies-bar-btn-color:        #777777;
+// $cookies-bar-btn-text-color:   #ffffff;
 // $cookies-bar-line-height:      40px;
 
 // keep this on the last line

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eu_cookies
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Alessandro Lepore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties