Ginger – EU Cookie Law - Version 1.1.3

Version Description

  • Bugfix
Download this release

Release Info

Developer matteobarale
Plugin Icon 128x128 Ginger – EU Cookie Law
Version 1.1.3
Comparing to
See all releases

Code changes from version 1.1.2 to 1.1.3

Files changed (4) hide show
  1. admin/partial/banner.php +2 -33
  2. front/gingerfront.utils.php +9 -8
  3. ginger-eu-cookie-law.php +1 -1
  4. readme.txt +4 -1
admin/partial/banner.php CHANGED
@@ -120,37 +120,6 @@
120
 
121
 
122
  </p>
123
-
124
- <p>
125
- <label><b><?php _e("Read More Button", "ginger"); ?></b></label>
126
- </p>
127
-
128
- <p>
129
- <label><?php _e("Text", "ginger"); ?></label>
130
- <input name="read_more_button_text" id="read_more_button_text" type="text"
131
- value="<?php if ($options['read_more_button_text'] != "") {
132
- echo $options['read_more_button_text'];
133
- } else {
134
- echo _e('Read More', 'ginger');
135
- } ?>" <?php if ($options['read_more_button_status'] == "0") {
136
- echo 'disabled=true';
137
- } ?>>
138
- <?php echo _e('Enable:', 'ginger') ?>&nbsp;
139
- <input type="checkbox" id="read_more_button_status" name="read_more_button_status"
140
- value="1" <?php if ($options['read_more_button_status'] == "1" or $options['read_more_button_status'] == "") {
141
- echo 'checked';
142
- } ?>
143
- onclick="en_dis_able_text_banner_button('read_more_button_status','read_more_button_text','img_read_more_button_status');">
144
-
145
-
146
- <img id="img_read_more_button_status"
147
- src="<?php if ($options['read_more_button_status'] == "1" or $options['read_more_button_status'] == "") {
148
- echo plugins_url('/ginger/img/ok.png');
149
- } elseif ($options['read_more_button_status'] == "0") {
150
- echo plugins_url('/ginger/img/xx.png');
151
- } ?>" style="max-width: 20px; max-height: 20px; vertical-align: middle">
152
- </p>
153
-
154
  </fieldset>
155
  </td>
156
  </tr>
@@ -237,7 +206,7 @@
237
  <legend class="screen-reader-text"><span><?php _e("Insert here your banner custom CSS", "ginger"); ?></span></legend>
238
  <p>
239
  <label>
240
- <textarea name = "ginger_css" cols="100" rows="6" class="lined"><?php echo $options["ginger_css"];?></textarea>
241
 
242
  </label>
243
  </p>
@@ -257,4 +226,4 @@
257
  {selectedLine: 1}
258
  );
259
  });
260
- </script>
120
 
121
 
122
  </p>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
123
  </fieldset>
124
  </td>
125
  </tr>
206
  <legend class="screen-reader-text"><span><?php _e("Insert here your banner custom CSS", "ginger"); ?></span></legend>
207
  <p>
208
  <label>
209
+ <textarea name = "ginger_css" cols="100" rows="20" class="lined"><?php echo $options["ginger_css"];?></textarea>
210
 
211
  </label>
212
  </p>
226
  {selectedLine: 1}
227
  );
228
  });
229
+ </script>
front/gingerfront.utils.php CHANGED
@@ -15,7 +15,7 @@ add_action( 'wp_enqueue_scripts', 'ginger_style_script' );
15
  */
16
  function ginger_style_script() {
17
  $option_ginger_bar = get_option('ginger_banner');
18
- if($_COOKIE['ginger-cookie'] && $_COOKIE['ginger-cookie'] == 'N' || $option_ginger_bar['ginger_banner_type'] == 'dialog'):
19
  wp_register_style( 'ginger-style-dialog', plugin_dir_url( __FILE__ ) . 'css/cookies-enabler-dialog.css' );
20
  wp_enqueue_style( 'ginger-style-dialog' );
21
  else:
@@ -97,19 +97,20 @@ function ginger_scirpt(){ ?>
97
  $label_disable_cookie = __('Disable Cookies', 'ginger');
98
  endif;
99
  //Recupero style custom
100
- if($option_ginger_bar['background_color'] || $option_ginger_bar['text_color'] || $option_ginger_bar['link_color'] || $option_ginger_bar['ginger_css'] ): ?>
 
101
  <style>
102
  .ginger_container.<?php echo $option_ginger_bar['theme_ginger']; ?>{
103
  <?php if($option_ginger_bar['background_color']): ?> background-color: <?php echo $option_ginger_bar['background_color']; ?>;<?php endif; ?>
104
  <?php if($option_ginger_bar['text_color']): ?> color: <?php echo $option_ginger_bar['text_color']; ?>;<?php endif; ?>
105
  }
106
  <?php if($option_ginger_bar['button_color']): ?>
107
- .ginger_btn.ginger-accept, .ginger_btn.ginger-dismiss, .ginger_btn.ginger-disable{
108
- background: <?php echo $option_ginger_bar['button_color']; ?>;
109
  }
110
  <?php endif; ?>
111
  <?php if($option_ginger_bar['button_text_color']): ?>
112
- .ginger_banner-wrapper > div > a.ginger_btn {
113
  color: <?php echo $option_ginger_bar['button_text_color']; ?> !important;
114
  }
115
  <?php endif; ?>
@@ -203,13 +204,13 @@ add_action('wp_footer', 'ginger_scirpt');
203
  function ginger_run(){
204
  $option_ginger_general = get_option('ginger_general');
205
  if($option_ginger_general['enable_ginger'] != 1) return;
206
- if($_COOKIE['ginger-cookie'] && $_COOKIE['ginger-cookie'] == 'Y'):
207
  if($option_ginger_general['ginger_cache'] == 'no') return;
208
  endif;
209
  if($option_ginger_general['ginger_opt'] == 'in'):
210
  ob_start();
211
  add_action('shutdown', '__shutdown', 0);
212
- add_filter('final_output', 'ginger_parse_dom', $output);
213
  endif;
214
  }
215
  add_action('init', 'ginger_run');
@@ -311,4 +312,4 @@ function strpos_arr($haystack, $needle) {
311
  if(($pos = strpos($haystack, $what))!==false) return $key;
312
  }
313
  return false;
314
- }
15
  */
16
  function ginger_style_script() {
17
  $option_ginger_bar = get_option('ginger_banner');
18
+ if(isset($_COOKIE['ginger-cookie']) && $_COOKIE['ginger-cookie'] == 'N' || $option_ginger_bar['ginger_banner_type'] == 'dialog'):
19
  wp_register_style( 'ginger-style-dialog', plugin_dir_url( __FILE__ ) . 'css/cookies-enabler-dialog.css' );
20
  wp_enqueue_style( 'ginger-style-dialog' );
21
  else:
97
  $label_disable_cookie = __('Disable Cookies', 'ginger');
98
  endif;
99
  //Recupero style custom
100
+ if($option_ginger_bar['background_color'] || $option_ginger_bar['text_color'] || $option_ginger_bar['link_color'] || $option_ginger_bar['ginger_css'] || $option_ginger_bar['button_color'] || $option_ginger_bar['button_text_color']): ?>
101
+
102
  <style>
103
  .ginger_container.<?php echo $option_ginger_bar['theme_ginger']; ?>{
104
  <?php if($option_ginger_bar['background_color']): ?> background-color: <?php echo $option_ginger_bar['background_color']; ?>;<?php endif; ?>
105
  <?php if($option_ginger_bar['text_color']): ?> color: <?php echo $option_ginger_bar['text_color']; ?>;<?php endif; ?>
106
  }
107
  <?php if($option_ginger_bar['button_color']): ?>
108
+ a.ginger_btn.ginger-accept, .ginger_btn, .ginger_btn{
109
+ background: <?php echo $option_ginger_bar['button_color']; ?> !important;
110
  }
111
  <?php endif; ?>
112
  <?php if($option_ginger_bar['button_text_color']): ?>
113
+ a.ginger_btn {
114
  color: <?php echo $option_ginger_bar['button_text_color']; ?> !important;
115
  }
116
  <?php endif; ?>
204
  function ginger_run(){
205
  $option_ginger_general = get_option('ginger_general');
206
  if($option_ginger_general['enable_ginger'] != 1) return;
207
+ if(isset($_COOKIE['ginger-cookie']) && $_COOKIE['ginger-cookie'] == 'Y'):
208
  if($option_ginger_general['ginger_cache'] == 'no') return;
209
  endif;
210
  if($option_ginger_general['ginger_opt'] == 'in'):
211
  ob_start();
212
  add_action('shutdown', '__shutdown', 0);
213
+ add_filter('final_output', 'ginger_parse_dom');
214
  endif;
215
  }
216
  add_action('init', 'ginger_run');
312
  if(($pos = strpos($haystack, $what))!==false) return $key;
313
  }
314
  return false;
315
+ }
ginger-eu-cookie-law.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Ginger - EU Cookie Law
4
  Plugin URI: http://manafactory.it/
5
  Description: Make your website compliant with EU Cookie Policy.
6
- Version: 1.1.2
7
  Author: Manafactory
8
  Author URI: http://manafactory.it/
9
  License: GPLv2 or later
3
  Plugin Name: Ginger - EU Cookie Law
4
  Plugin URI: http://manafactory.it/
5
  Description: Make your website compliant with EU Cookie Policy.
6
+ Version: 1.1.3
7
  Author: Manafactory
8
  Author URI: http://manafactory.it/
9
  License: GPLv2 or later
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: manafactory, webgrafia, matteobarale
3
  Tags: EU Cookie Law, cookie law, block cookie, cookie consent, cookie law, cookie policy, privacy policy, cookie banner, italian cookie law, cookie italia
4
  Requires at least: 3.0.1
5
  Tested up to: 4.2.2
6
- Stable tag: 1.1.2
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -69,6 +69,9 @@ No, you can be safe from plugins conflict. It's been developed using Cookies Ena
69
 
70
  == Changelog ==
71
 
 
 
 
72
  = 1.1.2 =
73
  * Bugfix
74
 
3
  Tags: EU Cookie Law, cookie law, block cookie, cookie consent, cookie law, cookie policy, privacy policy, cookie banner, italian cookie law, cookie italia
4
  Requires at least: 3.0.1
5
  Tested up to: 4.2.2
6
+ Stable tag: 1.1.3
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
69
 
70
  == Changelog ==
71
 
72
+ = 1.1.3 =
73
+ * Bugfix
74
+
75
  = 1.1.2 =
76
  * Bugfix
77