Changeset 1525170
- Timestamp:
- 10/31/2016 09:38:50 AM (9 years ago)
- Location:
- custom-cookie-message/trunk
- Files:
-
- 6 edited
-
css/cookies.css (modified) (3 diffs)
-
custom-cookie-message.php (modified) (1 diff)
-
includes/ac-cookie-message.php (modified) (6 diffs)
-
js/ac-custom-cookie-message-backend.js (modified) (1 diff)
-
js/ac-custom-cookie-message-frontend.js (modified) (2 diffs)
-
views/cookie-notice.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
custom-cookie-message/trunk/css/cookies.css
r1525138 r1525170 28 28 } 29 29 30 #opacity_slider { 31 width: 180px; 32 } 33 34 #opacity_slider_amount { 35 width: 180px; 36 color: #555 !important; 37 } 38 39 #message_size_slider { 40 width: 180px; 41 } 42 43 #message_size_slider_amount { 44 width: 180px; 45 color: #555 !important; 46 } 47 48 #button_size_slider { 49 width: 180px; 50 } 51 52 #button_size_slider_amount { 53 width: 180px; 54 color: #555 !important; 55 } 30 56 31 57 .container-cookies … … 38 64 display: none; 39 65 height: auto; 40 opacity: 0.95;41 66 padding: 10px 0 10px 0; 42 67 } … … 64 89 line-height: 20px; 65 90 margin-bottom: 0; 91 margin-top: 0; 66 92 -webkit-box-flex: 1; 67 93 -ms-flex: 1; -
custom-cookie-message/trunk/custom-cookie-message.php
r1525138 r1525170 6 6 * Description: A customizable cookie message. 7 7 * Version: 1.0 8 * Author: Johan Sylvan8 * Author: johansylvan 9 9 * Author URI: https://angrycreative.se/ 10 10 **/ -
custom-cookie-message/trunk/includes/ac-cookie-message.php
r1525138 r1525170 72 72 public function register_plugin_styles(){ 73 73 wp_register_style('product_variation', CUSTOM_COOKIE_MESSAGE_PLUGIN_URL . '/css/cookies.css'); 74 74 75 wp_enqueue_style('product_variation'); 75 76 } 76 77 77 78 public function register_plugin_scripts(){ 78 //wp_enqueue_script('variation-custom-cookie-script', CUSTOM_COOKIE_MESSAGE_PLUGIN_URL . '/js/ac-custom-cookie-message-frontend.js', ['jquery']);79 79 80 80 // embed the javascript file that makes the AJAX request … … 86 86 87 87 public function register_backend_plugin_styles(){ 88 wp_enqueue_style('jquery- style', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/smoothness/jquery-ui.css'); 89 wp_register_style('product_variation', CUSTOM_COOKIE_MESSAGE_PLUGIN_URL . '/css/cookies.css'); 90 wp_enqueue_style('product_variation'); 88 91 wp_enqueue_style( 'wp-color-picker' ); 89 92 } … … 151 154 152 155 public function cookie_setcookie() { 153 setcookie( 'cookie-warning-message', 15, 30 * DAYS_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );154 wp_send_json( 1 );156 // setcookie( 'cookie-warning-message', 15, 30 * DAYS_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN ); 157 //wp_send_json( 1 ); 155 158 } 156 159 … … 330 333 'styling_options_section' ); 331 334 332 /*add_settings_field(333 'Opacity Slider',334 __('Opacity Slider', 'cookie-message'),335 array( $this, 'cookies_opacity_slider_callback' ),336 'cookies_styling_options',337 'styling_options_section' );*/338 339 335 add_settings_field( 340 336 'Button Color', … … 364 360 'cookies_styling_options', 365 361 'styling_options_section' ); 362 363 /*add_settings_field( 364 'Opacity', 365 __('Opacity', 'cookie-message'), 366 array( $this, 'cookies_opacity_slider_callback' ), 367 'cookies_styling_options', 368 'styling_options_section' ); 369 370 add_settings_field( 371 'Message Size', 372 __('Message Size', 'cookie-message'), 373 array( $this, 'cookies_message_size_slider_callback' ), 374 'cookies_styling_options', 375 'styling_options_section' ); 376 377 add_settings_field( 378 'button_size_', 379 __('Button Size', 'cookie-message'), 380 array( $this, 'cookies_button_size_slider_callback' ), 381 'cookies_styling_options', 382 'styling_options_section' );*/ 366 383 367 384 register_setting( … … 439 456 } 440 457 458 function cookies_button_color_picker_callback() { 459 $options = get_option('cookies_styling_options'); 460 461 $val = ( isset( $options['button_color_picker'] ) ) ? $options['button_color_picker'] : ''; 462 echo '<input type="text" id="button_color_picker" name="cookies_styling_options[button_color_picker]" value="' . $val . '" class="cpa-color-picker" >'; 463 } 464 465 function cookies_button_text_color_picker_callback() { 466 $options = get_option('cookies_styling_options'); 467 468 //$val = ( isset( $options['button_text_color_picker'] ) ) ? $options['button_text_color_picker'] : ''; 469 $val = $options['button_text_color_picker']; 470 echo '<input type="text" id="button_text_color_picker" name="cookies_styling_options[button_text_color_picker]" value="' . $val . '" class="cpa-color-picker" >'; 471 } 472 473 function cookies_text_color_picker_callback() { 474 $options = get_option('cookies_styling_options'); 475 476 $val = ( isset( $options['text_color_picker'] ) ) ? $options['text_color_picker'] : ''; 477 echo '<input type="text" id="text_color_picker" name="cookies_styling_options[text_color_picker]" value="' . $val . '" class="cpa-color-picker" >'; 478 } 479 480 function cookies_link_color_picker_callback() { 481 $options = get_option('cookies_styling_options'); 482 483 $val = ( isset( $options['link_color_picker'] ) ) ? $options['link_color_picker'] : ''; 484 echo '<input type="text" id="link_color_picker" name="cookies_styling_options[link_color_picker]" value="' . $val . '" class="cpa-color-picker" >'; 485 } 486 441 487 /*function cookies_opacity_slider_callback() { 442 488 $options = get_option('cookies_styling_options'); 443 489 444 $val = ( isset( $options['opacity_slider_amount'] ) ) ? $options['opacity_slider_amount'] : ' ';490 $val = ( isset( $options['opacity_slider_amount'] ) ) ? $options['opacity_slider_amount'] : '95'; 445 491 echo '<input type="text" id="opacity_slider_amount" name="cookies_styling_options[opacity_slider_amount]" value="' . $val . '" readonly style="border:0; color:#f6931f; font-weight:bold;">'; 446 492 echo '<div id="opacity_slider"></div>'; 493 } 494 495 function cookies_message_size_slider_callback() { 496 $options = get_option('cookies_styling_options'); 497 498 //print_r($options); 499 $val = ( isset( $options['message_size_slider_amount'] ) ) ? $options['message_size_slider_amount'] : '90'; 500 //var_dump($val); 501 echo '<input type="text" id="message_size_slider_amount" name="cookies_styling_options[message_size_slider_amount]" value="' . $val . '" readonly style="border:0; color:#f6931f; font-weight:bold;">'; 502 echo '<div id="message_size_slider"></div>'; 503 } 504 505 function cookies_button_size_slider_callback() { 506 $options = get_option('cookies_styling_options'); 507 508 $val = ( isset( $options['button_size_slider_amount'] ) ) ? $options['button_size_slider_amount'] : '90'; 509 echo '<input type="text" id="button_size_slider_amount" name="cookies_styling_options[button_size_slider_amount]" value="' . $val . '" readonly style="border:0; color:#f6931f; font-weight:bold;">'; 510 echo '<div id="button_size_slider"></div>'; 447 511 }*/ 448 449 function cookies_button_color_picker_callback() {450 $options = get_option('cookies_styling_options');451 452 $val = ( isset( $options['button_color_picker'] ) ) ? $options['button_color_picker'] : '';453 echo '<input type="text" id="button_color_picker" name="cookies_styling_options[button_color_picker]" value="' . $val . '" class="cpa-color-picker" >';454 }455 456 function cookies_button_text_color_picker_callback() {457 $options = get_option('cookies_styling_options');458 459 $val = ( isset( $options['button_text_color_picker'] ) ) ? $options['button_text_color_picker'] : '';460 echo '<input type="text" id="button_text_color_picker" name="cookies_styling_options[button_text_color_picker]" value="' . $val . '" class="cpa-color-picker" >';461 }462 463 function cookies_text_color_picker_callback() {464 $options = get_option('cookies_styling_options');465 466 $val = ( isset( $options['text_color_picker'] ) ) ? $options['text_color_picker'] : '';467 echo '<input type="text" id="text_color_picker" name="cookies_styling_options[text_color_picker]" value="' . $val . '" class="cpa-color-picker" >';468 }469 470 function cookies_link_color_picker_callback() {471 $options = get_option('cookies_styling_options');472 473 $val = ( isset( $options['link_color_picker'] ) ) ? $options['link_color_picker'] : '';474 echo '<input type="text" id="link_color_picker" name="cookies_styling_options[link_color_picker]" value="' . $val . '" class="cpa-color-picker" >';475 }476 512 477 513 // Iterates through every part of the input string and sanitizes it -
custom-cookie-message/trunk/js/ac-custom-cookie-message-backend.js
r1525138 r1525170 11 11 $( '.cpa-color-picker' ).wpColorPicker(); 12 12 13 14 $( "#opacity_slider" ).slider({ 13 /*$( "#opacity_slider" ).slider({ 15 14 range: "min", 16 value: 37,17 min: 1,15 value: parseInt($("#opacity_slider_amount").val()), 16 min: 50, 18 17 max: 100, 19 18 slide: function( event, ui ) { 20 $( "#opacity_slider_amount" ).val( "$" + ui.value);19 $( "#opacity_slider_amount" ).val( ui.value + "%"); 21 20 } 22 21 }); 23 $( "#opacity_slider_amount" ).val( "$" + $( "#opacity_slider" ).slider( "value" ) );24 22 23 $( "#message_size_slider" ).slider({ 24 range: "min", 25 //value: parseInt(message_slider_value), 26 value: parseInt($("#message_size_slider_amount").val()), 27 min: 50, 28 max: 100, 29 slide: function( event, ui ) { 30 $( "#message_size_slider_amount" ).val( ui.value ); 31 } 32 }); 33 34 $( "#button_size_slider" ).slider({ 35 range: "min", 36 value: parseInt($("#button_size_slider_amount").val()), 37 //value: 78, 38 min: 50, 39 max: 100, 40 slide: function( event, ui ) { 41 $( "#button_size_slider_amount" ).val( ui.value ); 42 } 43 });*/ 25 44 }); 26 45 }); -
custom-cookie-message/trunk/js/ac-custom-cookie-message-frontend.js
r1525138 r1525170 4 4 */ 5 5 6 6 7 jQuery(document).ready(function($) { 8 // Feature detect + local reference 9 var storage = (function() { 10 var uid = new Date; 11 var storage; 12 var result; 13 try { 14 (storage = window.localStorage).setItem(uid, uid); 15 result = storage.getItem(uid) == uid; 16 storage.removeItem(uid); 17 return result && storage; 18 } catch (exception) {} 19 }()); 7 20 8 21 setTimeout(function() { 9 $( '#custom-cookie-message-container' ).slideToggle( 400, function() { 10 $( this ).find( '.form-control' ).focus(); 11 } ); 22 if(storage) { 23 var fallback = storage.getItem("ac-cookie-fallback"); 24 if(fallback !== "fallback") { 25 26 $('#custom-cookie-message-container').slideToggle(400, function () { 27 $(this).find('.form-control').focus(); 28 }); 29 } 30 31 } else { 32 $('#custom-cookie-message-container').slideToggle(400, function () { 33 $(this).find('.form-control').focus(); 34 }); 35 } 36 37 38 12 39 },10); 13 40 … … 23 50 }) 24 51 .done(function( data ) { 52 53 storage.setItem("ac-cookie-fallback", "fallback") 25 54 $('#custom-cookie-message-container').hide(); 26 55 }) -
custom-cookie-message/trunk/views/cookie-notice.php
r1525138 r1525170 10 10 $styling_options = get_option('cookies_styling_options'); 11 11 ?> 12 <?php //echo $styling_options['opacity_amount']/100;?> 12 13 <?php if($general_options['location_options'] == 'top-fixed') { ?> 13 14 <style> … … 53 54 background-color: <?php echo $styling_options['message_color_picker'];?>; 54 55 color: <?php echo $styling_options['text_color_picker'];?>; 56 //opacity: <?php echo $styling_options['opacity_amount']/100;?>; 55 57 } 56 58
Note: See TracChangeset
for help on using the changeset viewer.