Changeset 2756713
- Timestamp:
- 07/15/2022 06:21:55 AM (4 years ago)
- Location:
- cinza-grid
- Files:
-
- 22 added
- 3 edited
-
tags/1.0.4 (added)
-
tags/1.0.4/assets (added)
-
tags/1.0.4/assets/css (added)
-
tags/1.0.4/assets/css/animate.min.css (added)
-
tags/1.0.4/assets/css/backend-admin.css (added)
-
tags/1.0.4/assets/css/backend-style.css (added)
-
tags/1.0.4/assets/css/frontend-style.css (added)
-
tags/1.0.4/assets/fonts (added)
-
tags/1.0.4/assets/fonts/icomoon.eot (added)
-
tags/1.0.4/assets/fonts/icomoon.svg (added)
-
tags/1.0.4/assets/fonts/icomoon.ttf (added)
-
tags/1.0.4/assets/fonts/icomoon.woff (added)
-
tags/1.0.4/assets/fonts/icomoon.woff2 (added)
-
tags/1.0.4/assets/js (added)
-
tags/1.0.4/assets/js/backend-script.js (added)
-
tags/1.0.4/assets/js/frontend-script.js (added)
-
tags/1.0.4/assets/js/isotope.pkgd.min.js (added)
-
tags/1.0.4/cinza-grid.php (added)
-
tags/1.0.4/includes (added)
-
tags/1.0.4/includes/backend-cpts.php (added)
-
tags/1.0.4/includes/backend-shortcodes.php (added)
-
tags/1.0.4/readme.txt (added)
-
trunk/cinza-grid.php (modified) (1 diff)
-
trunk/includes/backend-shortcodes.php (modified) (22 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
cinza-grid/trunk/cinza-grid.php
r2756655 r2756713 5 5 * Plugin URI: https://cinza.io/plugin/grid 6 6 * Description: A minimal grid plugin. 7 * Version: 1.0. 37 * Version: 1.0.4 8 8 * Requires at least: 5.2 9 9 * Requires PHP: 7.2 -
cinza-grid/trunk/includes/backend-shortcodes.php
r2756655 r2756713 45 45 46 46 if ($aux_orderby_meta && $aux_taxonomy) { 47 echo('Scenario 1');47 //echo('Scenario 1'); 48 48 $args = array( 49 49 'post_type' => esc_attr($cgrid_options['cgrid_posttype']), … … 62 62 ); 63 63 } else if (!$aux_orderby_meta && $aux_taxonomy) { 64 echo('Scenario 2');64 //echo('Scenario 2'); 65 65 $args = array( 66 66 'post_type' => esc_attr($cgrid_options['cgrid_posttype']), … … 78 78 ); 79 79 } else if ($aux_orderby_meta && !$aux_taxonomy) { 80 echo('Scenario 3');80 //echo('Scenario 3'); 81 81 $args = array( 82 82 'post_type' => esc_attr($cgrid_options['cgrid_posttype']), … … 88 88 ); 89 89 } else { 90 echo('Scenario 4');90 //echo('Scenario 4'); 91 91 $args = array( 92 92 'post_type' => esc_attr($cgrid_options['cgrid_posttype']), … … 149 149 } 150 150 151 ?><script>151 $script = "<script> 152 152 jQuery(document).ready(function($) { 153 var $grid = $('<?php echo "#cinza-grid-".$grid_id.""; ?>').isotope({ 153 154 var grid = $('#cinza-grid-".$grid_id."').isotope({ 154 155 itemSelector: '.cinza-grid-item', 155 156 layoutMode: 'fitRows', 156 getSortData: { <?php echo $sorts_data; ?>}157 getSortData: {".$sorts_data."} 157 158 }); 158 159 159 <?php if(!empty($sorts)) { ?>160 if( '".$sorts."' != '' ) { 160 161 // bind sort button click 161 $(' <?php echo "#cinza-grid-".$grid_id."-sorts"; ?>').on( 'click', 'button', function() {162 $('#cinza-grid-".$grid_id."-sorts').on( 'click', 'button', function() { 162 163 var sortByValue = $(this).attr('data-sort-by'); 163 $grid.isotope({ sortBy: sortByValue });164 grid.isotope({ sortBy: sortByValue }); 164 165 }); 165 166 166 167 // change is-checked class on buttons 167 $(' <?php echo "#cinza-grid-".$grid_id."-sorts"; ?>').each( function( i, buttonGroup ) {168 var $buttonGroup = $( buttonGroup );169 $buttonGroup.on( 'click', 'button', function() {170 $buttonGroup.find('.is-checked').removeClass('is-checked');168 $('#cinza-grid-".$grid_id."-sorts').each( function( i, buttonGroup ) { 169 var buttonGroup = $( buttonGroup ); 170 buttonGroup.on( 'click', 'button', function() { 171 buttonGroup.find('.is-checked').removeClass('is-checked'); 171 172 $( this ).addClass('is-checked'); 172 173 }); 173 174 }); 174 <?php } ?>175 } 175 176 176 <?php if(!empty($filters)) { ?>177 if( '".$filters."' != '' ) { 177 178 // store filter for each group 178 179 var filters = {}; 179 180 180 $(' <?php echo "#cinza-grid-".$grid_id."-filters"; ?>').on( 'click', '.button', function( event ) {181 var $button = $( event.currentTarget );181 $('#cinza-grid-".$grid_id."-filters').on( 'click', '.button', function( event ) { 182 var button = $( event.currentTarget ); 182 183 183 184 // get group key 184 var $buttonGroup = $button.parents('.cinza-grid-button-group');185 var filterGroup = $buttonGroup.attr('data-filter-group');185 var buttonGroup = button.parents('.cinza-grid-button-group'); 186 var filterGroup = buttonGroup.attr('data-filter-group'); 186 187 187 188 // set filter for group 188 filters[ filterGroup ] = $button.attr('data-filter');189 filters[ filterGroup ] = button.attr('data-filter'); 189 190 190 191 // combine filters … … 192 193 193 194 // set filter for Isotope 194 $grid.isotope({ filter: filterValue });195 grid.isotope({ filter: filterValue }); 195 196 }); 196 197 197 198 // change is-checked class on buttons 198 199 $('.cinza-grid-button-group').each( function( i, buttonGroup ) { 199 var $buttonGroup = $( buttonGroup );200 $buttonGroup.on( 'click', 'button', function( event ) {201 $buttonGroup.find('.is-checked').removeClass('is-checked');202 var $button = $( event.currentTarget );203 $button.addClass('is-checked');200 var buttonGroup = $( buttonGroup ); 201 buttonGroup.on( 'click', 'button', function( event ) { 202 buttonGroup.find('.is-checked').removeClass('is-checked'); 203 var button = $( event.currentTarget ); 204 button.addClass('is-checked'); 204 205 }); 205 206 }); … … 211 212 return value; 212 213 } 213 <?php } ?>214 } 214 215 }); 215 </script> <?php216 </script>"; 216 217 217 218 // Grid items … … 276 277 } 277 278 278 $filter_classes .= " ".str_replace(' ', '-', filter_meta_replace($post, $filters_temp));279 $filter_classes .= filter_meta_replace($post, $filters_temp); 279 280 280 281 // Replace taxonomy meta (without link and without separator) … … 315 316 } 316 317 317 $filter_classes .= " ".str_replace(' ', '-', filter_tax_replace($post, $filters_temp));318 $filter_classes .= filter_tax_replace($post, $filters_temp); 318 319 319 320 // Replace taxonomy meta (without link and with separator) … … 413 414 414 415 // Style 415 $style = "<style>"; 416 $style = "<style> 417 "; 416 418 417 // Breakpoint 1 ----- 418 $style .= "@media(max-width: ". esc_attr($cgrid_options['cgrid_breakpoint_2']-1) ."px) {419 $style .= "/* ----- Breakpoint 1 ----- */ 420 @media only screen and (max-width: ". esc_attr($cgrid_options['cgrid_breakpoint_2']-1) ."px) { 419 421 .cinza-grid { 420 422 width: calc(100% + ". esc_attr($cgrid_options['cgrid_spacing_2']) ."px); … … 422 424 } 423 425 .cinza-grid-item { 424 width: calc(100% / ". esc_attr($cgrid_options['cgrid_columns_1']) ." - ". esc_attr($cgrid_options['cgrid_spacing_1']) ."px );426 width: calc(100% / ". esc_attr($cgrid_options['cgrid_columns_1']) ." - ". esc_attr($cgrid_options['cgrid_spacing_1']) ."px - 1px); /* -1px to be safe */ 425 427 min-height: ". esc_attr($cgrid_options['cgrid_height_1']) ."px; 426 428 margin: calc(". esc_attr($cgrid_options['cgrid_spacing_1']) ."px / 2); … … 429 431 if (esc_attr($cgrid_options['cgrid_columns_1']) == 1) { 430 432 $style .= " 431 .cinza-grid {width: 100%; margin: 0px;} 432 .cinza-grid-item {width: 100%; margin: 0px 0px ". esc_attr($cgrid_options['cgrid_spacing_1']) ."px 0px;} 433 .cinza-grid-item:last-child {margin-bottom: 0px;} 434 "; 433 .cinza-grid {width: 100%; margin: 0px;} 434 .cinza-grid-item {width: 100%; margin: 0px 0px ". esc_attr($cgrid_options['cgrid_spacing_1']) ."px 0px;} 435 .cinza-grid-item:last-child {margin-bottom: 0px;}"; 435 436 } 436 $style .= "}"; 437 438 // Breakpoint 2 ----- 439 $style .= "@media (min-width: ". esc_attr($cgrid_options['cgrid_breakpoint_2']) ."px) and (max-width: ". esc_attr($cgrid_options['cgrid_breakpoint_3']-1) ."px) { 437 $style .= " 438 } 439 "; 440 441 $style .= "/* ----- Breakpoint 2 ----- */ 442 @media only screen and (min-width: ". esc_attr($cgrid_options['cgrid_breakpoint_2']) ."px) and (max-width: ". esc_attr($cgrid_options['cgrid_breakpoint_3']-1) ."px) { 440 443 .cinza-grid { 441 444 width: calc(100% + ". esc_attr($cgrid_options['cgrid_spacing_2']) ."px); … … 443 446 } 444 447 .cinza-grid-item { 445 width: calc(100% / ". esc_attr($cgrid_options['cgrid_columns_2']) ." - ". esc_attr($cgrid_options['cgrid_spacing_2']) ."px );448 width: calc(100% / ". esc_attr($cgrid_options['cgrid_columns_2']) ." - ". esc_attr($cgrid_options['cgrid_spacing_2']) ."px - 1px); /* -1px to be safe */ 446 449 min-height: ". esc_attr($cgrid_options['cgrid_height_2']) ."px; 447 450 margin: calc(". esc_attr($cgrid_options['cgrid_spacing_2']) ."px / 2); … … 450 453 if (esc_attr($cgrid_options['cgrid_columns_2']) == 1) { 451 454 $style .= " 452 .cinza-grid {width: 100%; margin: 0px;} 453 .cinza-grid-item {width: 100%; margin: 0px 0px ". esc_attr($cgrid_options['cgrid_spacing_2']) ."px 0px;} 454 .cinza-grid-item:last-child {margin-bottom: 0px;} 455 "; 455 .cinza-grid {width: 100%; margin: 0px;} 456 .cinza-grid-item {width: 100%; margin: 0px 0px ". esc_attr($cgrid_options['cgrid_spacing_2']) ."px 0px;} 457 .cinza-grid-item:last-child {margin-bottom: 0px;}"; 456 458 } 457 $style .= "}"; 459 $style .= " 460 } 461 "; 458 462 459 // Breakpoint 3 -----460 $style .= "@media(min-width: ". esc_attr($cgrid_options['cgrid_breakpoint_3']) ."px) and (max-width: ". esc_attr($cgrid_options['cgrid_breakpoint_4']-1) ."px) {463 $style .= "/* ----- Breakpoint 3 ----- */ 464 @media only screen and (min-width: ". esc_attr($cgrid_options['cgrid_breakpoint_3']) ."px) and (max-width: ". esc_attr($cgrid_options['cgrid_breakpoint_4']-1) ."px) { 461 465 .cinza-grid { 462 466 width: calc(100% + ". esc_attr($cgrid_options['cgrid_spacing_3']) ."px); … … 464 468 } 465 469 .cinza-grid-item { 466 width: calc(100% / ". esc_attr($cgrid_options['cgrid_columns_3']) ." - ". esc_attr($cgrid_options['cgrid_spacing_3']) ."px );470 width: calc(100% / ". esc_attr($cgrid_options['cgrid_columns_3']) ." - ". esc_attr($cgrid_options['cgrid_spacing_3']) ."px - 1px); /* -1px to be safe */ 467 471 min-height: ". esc_attr($cgrid_options['cgrid_height_3']) ."px; 468 472 margin: calc(". esc_attr($cgrid_options['cgrid_spacing_3']) ."px / 2); … … 471 475 if (esc_attr($cgrid_options['cgrid_columns_3']) == 1) { 472 476 $style .= " 473 .cinza-grid {width: 100%; margin: 0px;} 474 .cinza-grid-item {width: 100%; margin: 0px 0px ". esc_attr($cgrid_options['cgrid_spacing_3']) ."px 0px;} 475 .cinza-grid-item:last-child {margin-bottom: 0px;} 476 "; 477 .cinza-grid {width: 100%; margin: 0px;} 478 .cinza-grid-item {width: 100%; margin: 0px 0px ". esc_attr($cgrid_options['cgrid_spacing_3']) ."px 0px;} 479 .cinza-grid-item:last-child {margin-bottom: 0px;}"; 477 480 } 478 $style .= "}"; 481 $style .= " 482 } 483 "; 479 484 480 // Breakpoint 4 ----- 481 $style .= "@media(min-width: ". esc_attr($cgrid_options['cgrid_breakpoint_4']) ."px) and (max-width: ". esc_attr($cgrid_options['cgrid_breakpoint_5']-1) ."px) {485 $style .= "/* ----- Breakpoint 4 ----- */ 486 @media only screen and (min-width: ". esc_attr($cgrid_options['cgrid_breakpoint_4']) ."px) and (max-width: ". esc_attr($cgrid_options['cgrid_breakpoint_5']-1) ."px) { 482 487 .cinza-grid { 483 488 width: calc(100% + ". esc_attr($cgrid_options['cgrid_spacing_4']) ."px); … … 485 490 } 486 491 .cinza-grid-item { 487 width: calc(100% / ". esc_attr($cgrid_options['cgrid_columns_4']) ." - ". esc_attr($cgrid_options['cgrid_spacing_4']) ."px );492 width: calc(100% / ". esc_attr($cgrid_options['cgrid_columns_4']) ." - ". esc_attr($cgrid_options['cgrid_spacing_4']) ."px - 1px); /* -1px to be safe */ 488 493 min-height: ". esc_attr($cgrid_options['cgrid_height_4']) ."px; 489 494 margin: calc(". esc_attr($cgrid_options['cgrid_spacing_4']) ."px / 2); … … 492 497 if (esc_attr($cgrid_options['cgrid_columns_4']) == 1) { 493 498 $style .= " 494 .cinza-grid {width: 100%; margin: 0px;} 495 .cinza-grid-item {width: 100%; margin: 0px 0px ". esc_attr($cgrid_options['cgrid_spacing_4']) ."px 0px;} 496 .cinza-grid-item:last-child {margin-bottom: 0px;} 497 "; 499 .cinza-grid {width: 100%; margin: 0px;} 500 .cinza-grid-item {width: 100%; margin: 0px 0px ". esc_attr($cgrid_options['cgrid_spacing_4']) ."px 0px;} 501 .cinza-grid-item:last-child {margin-bottom: 0px;}"; 498 502 } 499 $style .= "}"; 503 $style .= " 504 } 505 "; 500 506 501 // Breakpoint 5 ----- 502 $style .= "@media(min-width: ". esc_attr($cgrid_options['cgrid_breakpoint_5']) ."px) {507 $style .= "/* ----- Breakpoint 5 ----- */ 508 @media only screen and (min-width: ". esc_attr($cgrid_options['cgrid_breakpoint_5']) ."px) { 503 509 .cinza-grid { 504 510 width: calc(100% + ". esc_attr($cgrid_options['cgrid_spacing_5']) ."px); … … 506 512 } 507 513 .cinza-grid-item { 508 width: calc(100% / ". esc_attr($cgrid_options['cgrid_columns_5']) ." - ". esc_attr($cgrid_options['cgrid_spacing_5']) ."px );514 width: calc(100% / ". esc_attr($cgrid_options['cgrid_columns_5']) ." - ". esc_attr($cgrid_options['cgrid_spacing_5']) ."px - 1px); /* -1px to be safe */ 509 515 min-height: ". esc_attr($cgrid_options['cgrid_height_5']) ."px; 510 516 margin: calc(". esc_attr($cgrid_options['cgrid_spacing_5']) ."px / 2); … … 513 519 if (esc_attr($cgrid_options['cgrid_columns_5']) == 1) { 514 520 $style .= " 515 .cinza-grid {width: 100%; margin: 0px;} 516 .cinza-grid-item {width: 100%; margin: 0px 0px ". esc_attr($cgrid_options['cgrid_spacing_5']) ."px 0px;} 517 .cinza-grid-item:last-child {margin-bottom: 0px;} 518 "; 521 .cinza-grid {width: 100%; margin: 0px;} 522 .cinza-grid-item {width: 100%; margin: 0px 0px ". esc_attr($cgrid_options['cgrid_spacing_5']) ."px 0px;} 523 .cinza-grid-item:last-child {margin-bottom: 0px;}"; 519 524 } 520 $style .= "}"; 525 $style .= " 526 } 527 "; 521 528 522 529 $style .= "</style>"; 523 530 524 return $debug . $sorts . $filters . $grid . $style ;531 return $debug . $sorts . $filters . $grid . $style . $script; 525 532 } 526 533 … … 533 540 $meta_code_args = substr($filters_temp, $meta_open_paranthesis+2, $meta_close_paranthesis-$meta_open_paranthesis-3); 534 541 $meta_formatted = get_post_meta( $post->ID, $meta_code_args, true ); 535 return strtolower($meta_formatted);542 return " ".str_replace(' ', '-', strtolower($meta_formatted)); 536 543 } 537 544 } … … 548 555 $terms_array = array(); 549 556 foreach ( $term_list as $term ) { 550 $terms_array[] = esc_attr( $term->name ); 551 } 552 $terms_string = join( ' ', $terms_array ); 553 $tax_formatted = $terms_string; 554 return strtolower($tax_formatted); 557 $terms_array[] = str_replace(' ', '-', esc_attr($term->name) ); 558 } 559 $tax_formatted = join( ' ', $terms_array ); 560 return " ".strtolower($tax_formatted); 555 561 } 556 562 } -
cinza-grid/trunk/readme.txt
r2756655 r2756713 5 5 Tested up to: 6.0 6 6 Requires PHP: 7.2 7 Stable tag: 1.0. 37 Stable tag: 1.0.4 8 8 License: GPLv2 or later 9 9 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 22 22 23 23 == Changelog == 24 25 = 1.0.4 = 26 *Release Date - 15th July, 2022* 27 28 - Fixed dynamic frontend style 29 - Fixed JavaScript console errors 30 - Fixed filter tags for grid items 31 - Fixed filter_meta_replace and filter_tax_replace 32 - Removed duplicated Metafizzy script 33 - Removed skin debug strings for WP Queries 34 24 35 = 1.0.3 = 25 36 *Release Date - 14th July, 2022*
Note: See TracChangeset
for help on using the changeset viewer.