| @@ -43,26 +43,25 @@ | ||
| 43 | 43 | 'queryTax' => [ |
| 44 | 44 | 'type' => 'string', |
| 45 | 45 | 'default' => 'category' |
| 46 | 46 | ], |
| 47 | - 'queryCat' => [ | |
| 47 | + 'queryTaxValue' => [ | |
| 48 | 48 | 'type' => 'string', |
| 49 | 49 | 'default' => '[]', |
| 50 | 50 | 'style' => [ |
| 51 | 51 | (object)[ |
| 52 | - 'depends' => [(object)['key' => 'queryTax','condition' => '==','value' => 'category']] | |
| 52 | + 'depends' => [(object)['key' => 'queryTax','condition' => '!=','value' => '']] | |
| 53 | 53 | ], |
| 54 | 54 | ], |
| 55 | 55 | ], |
| 56 | - 'queryTag' => [ | |
| 56 | + 'queryCat' => [ // for compatibility | |
| 57 | 57 | 'type' => 'string', |
| 58 | - 'default' => '[]', | |
| 59 | - 'style' => [ | |
| 60 | - (object)[ | |
| 61 | - 'depends' => [(object)['key' => 'queryTax','condition' => '==','value' => 'post_tag']] | |
| 62 | - ], | |
| 63 | - ], | |
| 58 | + 'default' => '[]' | |
| 64 | 59 | ], |
| 60 | + 'queryTag' => [ // for compatibility | |
| 61 | + 'type' => 'string', | |
| 62 | + 'default' => '[]' | |
| 63 | + ], | |
| 65 | 64 | 'queryOrderBy' => [ |
| 66 | 65 | 'type' => 'string', |
| 67 | 66 | 'default' => 'date', |
| 68 | 67 | ], |
| @@ -1008,9 +1007,9 @@ | ||
| 1008 | 1007 | 'depends' => [ |
| 1009 | 1008 | (object)['key'=>'catShow','condition'=>'==','value'=>true], |
| 1010 | 1009 | (object)['key'=>'customCatColor','condition'=>'!=','value'=>true], |
| 1011 | 1010 | ], |
| 1012 | - 'selector'=>'{{ULTP}} .ultp-category-grid a { color:{{catColor}}; }' | |
| 1011 | + 'selector'=>'{{ULTP}} .ultp-block-item .ultp-category-grid a { color:{{catColor}}; }' | |
| 1013 | 1012 | ], |
| 1014 | 1013 | ], |
| 1015 | 1014 | ], |
| 1016 | 1015 | 'catBgColor' => [ |
| @@ -1531,26 +1530,25 @@ | ||
| 1531 | 1530 | 'filterText' => [ |
| 1532 | 1531 | 'type' => 'string', |
| 1533 | 1532 | 'default' => 'all' |
| 1534 | 1533 | ], |
| 1535 | - 'filterCat' => [ | |
| 1534 | + 'filterValue' => [ | |
| 1536 | 1535 | 'type' => 'string', |
| 1537 | 1536 | 'default' => '[]', |
| 1538 | 1537 | 'style' => [ |
| 1539 | 1538 | (object)[ |
| 1540 | - 'depends' => [(object)['key' => 'filterType','condition' => '==','value' => 'category']] | |
| 1539 | + 'depends' => [(object)['key' => 'filterType','condition' => '!=','value' => '']] | |
| 1541 | 1540 | ], |
| 1542 | 1541 | ], |
| 1543 | 1542 | ], |
| 1544 | - 'filterTag' => [ | |
| 1543 | + 'filterCat' => [ // for compatibility | |
| 1545 | 1544 | 'type' => 'string', |
| 1546 | - 'default' => '[]', | |
| 1547 | - 'style' => [ | |
| 1548 | - (object)[ | |
| 1549 | - 'depends' => [(object)['key' => 'filterType','condition' => '==','value' => 'post_tag']] | |
| 1550 | - ], | |
| 1551 | - ], | |
| 1545 | + 'default' => '[]' | |
| 1552 | 1546 | ], |
| 1547 | + 'filterTag' => [ // for compatibility | |
| 1548 | + 'type' => 'string', | |
| 1549 | + 'default' => '[]' | |
| 1550 | + ], | |
| 1553 | 1551 | 'fliterTypo' => [ |
| 1554 | 1552 | 'type' => 'object', |
| 1555 | 1553 | 'default' => (object)['openTypography' => 1,'size' => (object)['lg' =>14, 'unit' =>'px'],'height' => (object)['lg' =>18, 'unit' =>'px'], 'decoration' => 'none','family'=>'','weight'=>500], |
| 1556 | 1554 | 'style' => [ |
| @@ -1869,15 +1867,15 @@ | ||
| 1869 | 1867 | ], |
| 1870 | 1868 | ], |
| 1871 | 1869 | 'pagiHoverbg' => [ |
| 1872 | 1870 | 'type' => 'object', |
| 1873 | - 'default' => (object)['openColor' => 1, 'type' => 'color', 'color' => '#1740f5', 'replace'=>1], | |
| 1871 | + 'default' => (object)['openColor' => 1, 'type' => 'color', 'color' => '#1740f5','replace'=>1], | |
| 1874 | 1872 | 'style' => [ |
| 1875 | 1873 | (object)[ |
| 1876 | 1874 | 'depends' => [ |
| 1877 | 1875 | (object)['key'=>'paginationShow','condition'=>'==','value'=>true], |
| 1878 | 1876 | ], |
| 1879 | - 'selector'=>'{{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover { {{pagiHoverbg}} } @media (min-width: 768px) { {{ULTP}} .ultp-pagination li a:hover { {{pagiHoverbg}} }}' | |
| 1877 | + 'selector'=>'{{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-pagination-wrap .ultp-pagination li a:focus, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover{ {{pagiHoverbg}} }' | |
| 1880 | 1878 | ], |
| 1881 | 1879 | ], |
| 1882 | 1880 | ], |
| 1883 | 1881 | 'pagiHoverBorder' => [ |
| @@ -1911,9 +1909,9 @@ | ||
| 1911 | 1909 | (object)[ |
| 1912 | 1910 | 'depends' => [ |
| 1913 | 1911 | (object)['key'=>'paginationShow','condition'=>'==','value'=>true], |
| 1914 | 1912 | ], |
| 1915 | - 'selector'=>'{{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover { border-radius:{{pagiHoverRadius}}; }' | |
| 1913 | + 'selector'=>'{{ULTP}} .ultp-pagination li.pagination-active a, {{ULTP}} .ultp-pagination li a:hover, {{ULTP}} .ultp-next-prev-wrap ul li a:hover, {{ULTP}} .ultp-loadmore-action:hover { border-radius:{{pagiHoverRadius}}; }' | |
| 1916 | 1914 | ], |
| 1917 | 1915 | ], |
| 1918 | 1916 | ], |
| 1919 | 1917 | 'pagiPadding' => [ |
| @@ -2134,10 +2132,10 @@ | ||
| 2134 | 2132 | |
| 2135 | 2133 | public function content($attr, $noAjax) { |
| 2136 | 2134 | |
| 2137 | 2135 | if(!$noAjax){ |
| 2138 | - $paged = (get_query_var('paged')) ? get_query_var('paged') : 1; | |
| 2139 | - $attr['paged'] = $paged; | |
| 2136 | + $paged = is_front_page() ? get_query_var('page') : get_query_var('paged'); | |
| 2137 | + $attr['paged'] = $paged ? $paged : 1; | |
| 2140 | 2138 | } |
| 2141 | 2139 | |
| 2142 | 2140 | $block_name = 'post-grid-6'; |
| 2143 | 2141 | $page_post_id = get_the_ID(); |