| @@ -69,16 +69,8 @@ | ||
| 69 | 69 | #ao_show_adv:before { |
| 70 | 70 | content: "\f108 \f140"; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | -/* animate "show adv" button */ | |
| 74 | -#ao_show_adv { animation: watchmenow 3s linear 5s 10; } | |
| 75 | -#ao_show_adv:hover { animation: none; } | |
| 76 | -@keyframes watchmenow { | |
| 77 | - 0% { box-shadow: unset; } | |
| 78 | - 100% { box-shadow: 0px 0px 20px yellow; } | |
| 79 | -} | |
| 80 | - | |
| 81 | 73 | /* form */ |
| 82 | 74 | .itemDetail { |
| 83 | 75 | background: #fff; |
| 84 | 76 | border: 1px solid #ccc; |
| @@ -158,15 +150,11 @@ | ||
| 158 | 150 | |
| 159 | 151 | <div class="wrap"> |
| 160 | 152 | |
| 161 | 153 | <?php if (version_compare(PHP_VERSION, '5.3.0') < 0) { ?> |
| 162 | -<div class="notice-error notice"><?php echo '<p>' . sprintf( __('<strong>You are using a very old version of PHP</strong> which will not be supported as from the upcoming Autoptimize 2.4 any more, cfr. <a href=%s>this blogpost for more info</a>. please ask your hoster to provide you with an upgrade path to 7.x.','autoptimize'), '"https://blog.futtta.be/2018/02/13/introducing-zytzagoos-major-changes-for-autoptimize-2-4/" target="_blank"' ) . '</p>'; ?></div> | |
| 154 | +<div class="notice-error notice"><?php _e('<p><strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href="http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank">serious security and performance issues</a>. Please ask your hoster to provide you with an upgrade path to 5.6 or 7.0</p>','autoptimize'); ?></div> | |
| 163 | 155 | <?php } ?> |
| 164 | 156 | |
| 165 | -<?php if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { ?> | |
| 166 | -<div class="notice-error notice"><?php echo '<p>' . sprintf( __('You are forcing Autoptimize to use the "legacy minifiers" by setting the AUTOPTIMIZE_LEGACY_MINIFIERS constant in /wp-config.php. The "legacy minifiers" will not be supported as from the upcoming Autoptimize 2.4 any more, cfr. <a href=%s>this blogpost for more info</a>.','autoptimize'), '"https://blog.futtta.be/2018/02/13/introducing-zytzagoos-major-changes-for-autoptimize-2-4/" target="_blank"') . '</p>'; ?></div> | |
| 167 | -<?php } ?> | |
| 168 | - | |
| 169 | 157 | <div id="autoptimize_main"> |
| 170 | 158 | <div id="ao_title_and_button"> |
| 171 | 159 | <h1 id="ao_title"><?php _e('Autoptimize Settings','autoptimize'); ?> |
| 172 | 160 | <span id="ao_adv_button"> |
| @@ -221,13 +209,13 @@ | ||
| 221 | 209 | </tr> |
| 222 | 210 | <tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
| 223 | 211 | <th scope="row"><?php _e('Force JavaScript in <head>?','autoptimize'); ?></th> |
| 224 | 212 | <td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead')?'checked="checked" ':''; ?>/> |
| 225 | -<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.','autoptimize'); ?></label></td> | |
| 213 | +<?php _e('Load JavaScript early, reducing the chance of JS-errors but making it render blocking. You can disable this if you\'re not aggregating inline JS and you want JS to be deferred.','autoptimize'); ?></label></td> | |
| 226 | 214 | </tr> |
| 227 | 215 | <?php if (get_option('autoptimize_js_justhead')) { ?> |
| 228 | 216 | <tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
| 229 | -<th scope="row"><?php _e('Look for scripts only in <head>?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th> | |
| 217 | +<th scope="row"><?php _e('Look for scripts only in <head>?','autoptimize'); _e(' <i>(deprecated)</i>','autoptimize'); ?></th> | |
| 230 | 218 | <td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead')?'checked="checked" ':''; ?>/> |
| 231 | 219 | <?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.','autoptimize'); ?></label></td> |
| 232 | 220 | </tr> |
| 233 | 221 | <?php } ?> |
| @@ -233,9 +221,9 @@ | ||
| 233 | 221 | <?php } ?> |
| 234 | 222 | <tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
| 235 | 223 | <th scope="row"><?php _e('Also aggregate inline JS?','autoptimize'); ?></th> |
| 236 | 224 | <td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline')?'checked="checked" ':''; ?>/> |
| 237 | -<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.','autoptimize'); ?></label></td> | |
| 225 | +<?php _e('Check this option for Autoptimize to also aggregate JS in the HTML. If this option is not enabled, you might have to "force JavaScript in head".','autoptimize'); ?></label></td> | |
| 238 | 226 | </tr> |
| 239 | 227 | <tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
| 240 | 228 | <th scope="row"><?php _e('Exclude scripts from Autoptimize:','autoptimize'); ?></th> |
| 241 | 229 | <td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude',"seal.js, js/jquery/jquery.js"); ?>"/><br /> |
| @@ -260,11 +248,16 @@ | ||
| 260 | 248 | <th scope="row"><?php _e('Generate data: URIs for images?','autoptimize'); ?></th> |
| 261 | 249 | <td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris')?'checked="checked" ':''; ?>/> |
| 262 | 250 | <?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.','autoptimize'); ?></label></td> |
| 263 | 251 | </tr> |
| 252 | +<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top"> | |
| 253 | +<th scope="row"><?php _e('Remove Google Fonts?','autoptimize'); ?></th> | |
| 254 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont')?'checked="checked" ':''; ?>/> | |
| 255 | +<?php _e('Check this if you don\'t need or want Google Fonts being loaded.','autoptimize'); ?></label></td> | |
| 256 | +</tr> | |
| 264 | 257 | <?php if (get_option('autoptimize_css_justhead')) { ?> |
| 265 | 258 | <tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv"> |
| 266 | -<th scope="row"><?php _e('Look for styles only in <head>?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th> | |
| 259 | +<th scope="row"><?php _e('Look for styles only in <head>?','autoptimize'); _e(' <i>(deprecated)</i>','autoptimize'); ?></th> | |
| 267 | 260 | <td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead')?'checked="checked" ':''; ?>/> |
| 268 | 261 | <?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.','autoptimize'); ?></label></td> |
| 269 | 262 | </tr> |
| 270 | 263 | <?php } ?> |
| @@ -288,9 +281,9 @@ | ||
| 288 | 281 | <?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.','autoptimize'); ?></label></td> |
| 289 | 282 | </tr> |
| 290 | 283 | <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub"> |
| 291 | 284 | <th scope="row"><?php _e('Exclude CSS from Autoptimize:','autoptimize'); ?></th> |
| 292 | -<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude','wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css'); ?>"/><br /> | |
| 285 | +<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude','admin-bar.min.css, dashicons.min.css'); ?>"/><br /> | |
| 293 | 286 | <?php _e('A comma-separated list of CSS you want to exclude from being optimized.','autoptimize'); ?></label></td> |
| 294 | 287 | </tr> |
| 295 | 288 | </table> |
| 296 | 289 | </li> |
| @@ -300,9 +293,9 @@ | ||
| 300 | 293 | <table class="form-table"> |
| 301 | 294 | <tr valign="top"> |
| 302 | 295 | <th scope="row"><?php _e('CDN Base URL','autoptimize'); ?></th> |
| 303 | 296 | <td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url',''),array("http","https")); ?>" /><br /> |
| 304 | -<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.','autoptimize'); ?></label></td> | |
| 297 | +<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>).','autoptimize'); ?></label></td> | |
| 305 | 298 | </tr> |
| 306 | 299 | </table> |
| 307 | 300 | </li> |
| 308 | 301 | |
| @@ -321,44 +314,19 @@ | ||
| 321 | 314 | <th scope="row"><?php _e('Cached styles and scripts','autoptimize'); ?></th> |
| 322 | 315 | <td><?php |
| 323 | 316 | $AOstatArr=autoptimizeCache::stats(); |
| 324 | 317 | $AOcacheSize=round($AOstatArr[1]/1024); |
| 325 | - printf( __( '%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2]) ); | |
| 318 | + echo $AOstatArr[0].__(' files, totalling ','autoptimize').$AOcacheSize.__(' Kbytes (calculated at ','autoptimize').date("H:i e", $AOstatArr[2]).')'; | |
| 326 | 319 | ?></td> |
| 327 | 320 | </tr> |
| 321 | +<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> | |
| 322 | +<th scope="row"><?php _e('Save aggregated script/css as static files?','autoptimize'); ?></th> | |
| 323 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip','1')?'checked="checked" ':''; ?>/> | |
| 324 | +<?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.','autoptimize'); ?></label></td> | |
| 325 | +</tr> | |
| 328 | 326 | </table> |
| 329 | 327 | </li> |
| 330 | 328 | |
| 331 | -<li class="<?php echo $hiddenClass;?>itemDetail ao_adv"> | |
| 332 | -<h2 class="itemTitle"><?php _e('Misc Options','autoptimize'); ?></h2> | |
| 333 | -<table class="form-table"> | |
| 334 | - <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> | |
| 335 | - <th scope="row"><?php _e('Save aggregated script/css as static files?','autoptimize'); ?></th> | |
| 336 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip','1')?'checked="checked" ':''; ?>/> | |
| 337 | - <?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.','autoptimize'); ?></label> | |
| 338 | - </td> | |
| 339 | - </tr> | |
| 340 | - <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> | |
| 341 | - <th scope="row"><?php _e('Also optimize for logged in users?','autoptimize'); ?></th> | |
| 342 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged','1')?'checked="checked" ':''; ?>/> | |
| 343 | - <?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.','autoptimize'); ?></label> | |
| 344 | - </td> | |
| 345 | - </tr> | |
| 346 | - <?php | |
| 347 | - if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) { | |
| 348 | - ?> | |
| 349 | - <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> | |
| 350 | - <th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th> | |
| 351 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/> | |
| 352 | - <?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.','autoptimize'); ?></label> | |
| 353 | - </td> | |
| 354 | - </tr> | |
| 355 | - <?php | |
| 356 | - } | |
| 357 | - ?> | |
| 358 | -</table> | |
| 359 | -</li> | |
| 360 | - | |
| 361 | 329 | </ul> |
| 362 | 330 | |
| 363 | 331 | <input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv','0'); ?>"> |
| 364 | 332 | |
| @@ -386,9 +354,9 @@ | ||
| 386 | 354 | } |
| 387 | 355 | echo $AO_banner; |
| 388 | 356 | } |
| 389 | 357 | ?> |
| 390 | - <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.","autoptimize"); ?></li> | |
| 358 | + <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ</a> or post your question on <a href='http://wordpress.org/support/plugin/autoptimize'>the support-forum</a>.","autoptimize"); ?></li> | |
| 391 | 359 | <li><?php _e("Happy with Autoptimize?","autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!","autoptimize"); ?></a></li> |
| 392 | 360 | </ul> |
| 393 | 361 | </div> |
| 394 | 362 | <div style="margin-left:10px;margin-top:-5px;"> |
| @@ -411,9 +379,9 @@ | ||
| 411 | 379 | <?php $this->getFutttaFeeds("http://feeds.feedburner.com/futtta_webtech"); ?> |
| 412 | 380 | </div> |
| 413 | 381 | </div> |
| 414 | 382 | </div> |
| 415 | - <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!","autoptimize"); ?>"></a></div> | |
| 383 | + <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!"); ?>"></a></div> | |
| 416 | 384 | </div> |
| 417 | 385 | |
| 418 | 386 | <script type="text/javascript"> |
| 419 | 387 | var feed = new Array; |
| @@ -582,14 +550,13 @@ | ||
| 582 | 550 | register_setting('autoptimize','autoptimize_css_defer'); |
| 583 | 551 | register_setting('autoptimize','autoptimize_css_defer_inline'); |
| 584 | 552 | register_setting('autoptimize','autoptimize_css_inline'); |
| 585 | 553 | register_setting('autoptimize','autoptimize_css_include_inline'); |
| 554 | + register_setting('autoptimize','autoptimize_css_nogooglefont'); | |
| 586 | 555 | register_setting('autoptimize','autoptimize_cdn_url'); |
| 587 | 556 | register_setting('autoptimize','autoptimize_cache_clean'); |
| 588 | 557 | register_setting('autoptimize','autoptimize_cache_nogzip'); |
| 589 | 558 | register_setting('autoptimize','autoptimize_show_adv'); |
| 590 | - register_setting('autoptimize','autoptimize_optimize_logged'); | |
| 591 | - register_setting('autoptimize','autoptimize_optimize_checkout'); | |
| 592 | 559 | } |
| 593 | 560 | |
| 594 | 561 | public function setmeta($links,$file=null) { |
| 595 | 562 | //Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/ |
| @@ -625,9 +592,9 @@ | ||
| 625 | 592 | 'autoptimize_js_justhead' => 0, |
| 626 | 593 | 'autoptimize_js_include_inline' => 0, |
| 627 | 594 | 'autoptimize_js_forcehead' => 0, |
| 628 | 595 | 'autoptimize_css' => 0, |
| 629 | - 'autoptimize_css_exclude' => "admin-bar.min.css, dashicons.min.css, wp-content/cache/, wp-content/uploads/", | |
| 596 | + 'autoptimize_css_exclude' => "admin-bar.min.css, dashicons.min.css", | |
| 630 | 597 | 'autoptimize_css_justhead' => 0, |
| 631 | 598 | 'autoptimize_css_include_inline' => 1, |
| 632 | 599 | 'autoptimize_css_defer' => 0, |
| 633 | 600 | 'autoptimize_css_defer_inline' => "", |
| @@ -632,13 +599,12 @@ | ||
| 632 | 599 | 'autoptimize_css_defer' => 0, |
| 633 | 600 | 'autoptimize_css_defer_inline' => "", |
| 634 | 601 | 'autoptimize_css_inline' => 0, |
| 635 | 602 | 'autoptimize_css_datauris' => 0, |
| 603 | + 'autoptimize_css_nogooglefont' => 0, | |
| 636 | 604 | 'autoptimize_cdn_url' => "", |
| 637 | 605 | 'autoptimize_cache_nogzip' => 1, |
| 638 | - 'autoptimize_show_adv' => 0, | |
| 639 | - 'autoptimize_optimize_logged' => 1, | |
| 640 | - 'autoptimize_optimize_checkout' => 1 | |
| 606 | + 'autoptimize_show_adv' => 0 | |
| 641 | 607 | ); |
| 642 | 608 | |
| 643 | 609 | //Override with user settings |
| 644 | 610 | foreach(array_keys($config) as $name) { |
| @@ -649,9 +615,9 @@ | ||
| 649 | 615 | } |
| 650 | 616 | } |
| 651 | 617 | |
| 652 | 618 | //Save for next question |
| 653 | - $this->config = apply_filters( 'autoptimize_filter_get_config', $config ); | |
| 619 | + $this->config = $config; | |
| 654 | 620 | } |
| 655 | 621 | |
| 656 | 622 | if(isset($this->config[$key])) |
| 657 | 623 | return $this->config[$key]; |
