Compare commits

...

7 Commits

18 changed files with 389 additions and 129 deletions

View File

@ -17,7 +17,7 @@ Theme URI: https://git.hangar.org/xarxaprod/
Author: Hangar.org Tech Lab - hangar.org
Author URI: https://hangar.org
Description: theme for the <a href="https://xarxaprod.cat">XarxaProd</a>. Inclou la possibilitat de publicar, catalogar i cercar ajuts, resoldre dubtes amb FAQs i altres. Design by Eudald Van der Pla <a href="https://vanderpla.com">vanderpla.com</a>. Coding template and theme by <a href="https://vitrubio.net">Jorge - vitrubio.net</a>
Version: 1.6.1
Version: 1.6.5
Tested up to: 6.4
Requires PHP: 7.4
License: GNU General Public License v3 or later
@ -1742,7 +1742,9 @@ Add your custom styles in this file so it is easier to update the theme.
min-height: 40vh;
}
.edit-post-visual-editor__content-area .editor-styles-wrapper .post-type-archive-xarxaprod-associat .archive-posts {
.edit-post-visual-editor__content-area .editor-styles-wrapper .archive-posts.archive-posts-map,
.edit-post-visual-editor__content-area .editor-styles-wrapper .archive-posts.archive-xarxaprod-members,
.edit-post-visual-editor__content-area .editor-styles-wrapper .archive-postsarchive-xarxaprod-associats {
grid-template-columns: 1fr;
}

File diff suppressed because one or more lines are too long

View File

@ -32,32 +32,61 @@ get_header();
<?php xarxaprod_show_leaflet_map(); // function defined in the plugin ?>
</figure>
<?php if ( have_posts() ) : ?>
<?php while ( have_posts() ) : the_post();
xarxaprod_show_leaflet_associat_blob(); // function defined in the plugin
//get_template_part( 'template-parts/section', 'eachmember' );
endwhile; ?>
<?php
//if ( have_posts() ) :
// while ( have_posts() ) : the_post();
// xarxaprod_show_leaflet_associat_blob(); // function defined in the plugin
// endwhile;
//else :
// get_template_part( 'template-parts/content', 'none' );
//endif;
?>
<content class="archive-posts archive-posts-map archive-xarxaprod-members archive-xarxaprod-associats <?php xarxaprod_class_posttype(); ?>">
<?php
// https://support.advancedcustomfields.com/forums/topic/wp_query-using-meta_query-for-an-acf-checkbox-field/#post-145830
// https://www.advancedcustomfields.com/resources/checkbox/#query-posts
// https://barn2.com/blog/querying-posts-by-custom-field-acfi/
$the_query_associat = new WP_Query(
array(
'post_type' => 'xarxaprod-associat',
'order' => 'ASC', //order a b c d ...
'order_by' => 'name', // by name slug
'posts_per_page' => '-1' //all of them
)
);
?>
<?php if ( $the_query_associat->have_posts() ) : ?>
<?php while ( $the_query_associat->have_posts() ) : $the_query_associat->the_post(); ?>
<?php xarxaprod_show_leaflet_associat_blob(); ?>
<?php endwhile;//end of the loop ?>
<?php wp_reset_postdata(); ?>
<?php endif; //end query associat ?>
<ul class="xarxaprod-label">
<?php while ( have_posts() ) : the_post(); ?>
<li>
<a href="<?php the_permalink(); ?>" title="<?php the_title(); ?>" rel="bookmark">
<?php the_title(); ?>
</a>
</li>
<?php endwhile; ?>
</ul>
<?php
//the_posts_navigation();
// nuvol de nomb sde fabriques
echo '<ul class="xarxaprod-label">';
while ( have_posts() ) : the_post();
echo '<li>';
echo '<a href="';
the_permalink();
echo '" title="';
the_title();
echo '" rel="bookmark">';
the_title();
echo '</a>';
echo '</li>';
endwhile;
echo '</ul>';
?>
else :
get_template_part( 'template-parts/content', 'none' );
endif;
?>
</content>
<section id="filteredassociats" class="xarxaprod-filtered-content xarxaprod-filtered-associats xarxaprod-associats-filtrats">
</section>

View File

@ -31,22 +31,49 @@ get_header();
<content class="archive-posts <?php xarxaprod_class_posttype(); ?>">
<?php if ( have_posts() ) : ?>
<?php while ( have_posts() ) : the_post();
get_template_part( 'template-parts/section', 'eachconvo' );
endwhile;
the_posts_navigation();
else :
get_template_part( 'template-parts/content', 'none' );
endif;
<?php
// loop by default in archive.php
//if ( have_posts() ) :
// while ( have_posts() ) : the_post();
// get_template_part( 'template-parts/section', 'eachconvo' );
// endwhile;
// the_posts_navigation();
//else :
// get_template_part( 'template-parts/content', 'none' );
//endif;
?>
<?php
// https://support.advancedcustomfields.com/forums/topic/wp_query-using-meta_query-for-an-acf-checkbox-field/#post-145830
// https://www.advancedcustomfields.com/resources/checkbox/#query-posts
// https://barn2.com/blog/querying-posts-by-custom-field-acfi/
$the_query_convo = new WP_Query(
array(
'post_type' => 'xarxaprod-convo',
'order_by' => 'meta_value', //order by meta value
'meta_key' => 'xxp_convo_apply_end', // order by meta key convo apply end
'order' => 'ASC', //order ascendent
'posts_per_page' => '-1', //show all
'meta_query' => array(
array( //filter results show only older than today
'key' => 'xxp_convo_apply_end',
'value' => date("Y-m-d"), // consider using date_i18n() https://developer.wordpress.org/reference/functions/date_i18n/
'compare' => '>=', //show events from today and later
'type' => 'DATE',
)
)
)
);
?>
<?php if ( $the_query_convo->have_posts() ) : ?>
<?php while ( $the_query_convo->have_posts() ) : $the_query_convo->the_post(); ?>
<?php get_template_part( 'template-parts/section', 'eachconvo' , $the_query_convo); ?>
<?php endwhile;//end of the loop ?>
<?php wp_reset_postdata(); ?>
<?php endif; ?>
</content>
<section id="filteredcall" class="xarxaprod-filtered-content xarxaprod-filtered-convos xarxaprod-convos-filtrats">
</section>

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,7 @@
/**
* The template for displaying the "agenda" activities with search capabilities
*
* Template Name: Pagina Agenda
* Template Name: Agenda Arxiu
*
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/
* @link https://developer.wordpress.org/themes/template-files-section/page-template-files/

View File

@ -0,0 +1,96 @@
<?php
/**
* The template for displaying the "agenda" activities with search capabilities
*
* Template Name: Agenda actual cercador
*
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/
* @link https://developer.wordpress.org/themes/template-files-section/page-template-files/
*
* @package Xarxaprod_theme
* @since 1.0
*/
get_header();
?>
<!-- page-templates convos-search-php -->
<main id="primary" class="site-main">
<?php if ( have_posts() ) : ?>
<?php
while ( have_posts() ) :
the_post();
get_template_part( 'template-parts/content', 'page' );
endwhile;
the_posts_navigation();
else :
//get_template_part( 'template-parts/content', 'none' );
endif;
?>
<section id="filteredagenda" class="xarxaprod-filtered-content xarxaprod-filtered-agenda xarxaprod-activitats-filtrats category-agenda xarxaprod-activitats">
<aside id="agendafilter" class="xarxaprod-filter-agenda xarxaprod-fitre-agenda">
<?php include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); if ( is_plugin_active( 'xarxaprod-wp-plugin/xarxaprod-wp-plugin.php' ) ) { // if plugin active do?>
<?php } //end if is_plugin_active ?>
<?php wp_nav_menu(
array(
'theme_location' => 'menu-3',
'menu_id' => 'agenda-menu',
)
); ?>
</aside>
<content class="archive-posts <?php //xarxaprod_class_posttype(); ?>">
<?php
$the_query_archive_agenda = new WP_Query(
array(
'post_type' => 'post',
'posts_per_page' => '40', //show all => -1
'tax_query' => array(
array(
'taxonomy' => 'category',
'field' => 'slug',
'terms' => 'activitats'
)
),
//'order_by' => 'meta_value', //order by meta value
//'meta_key' => 'xxp_convo_apply_end', // order by meta key convo apply end
'order' => 'ASC', //order ascendent
'meta_query' => array(
array( //filter results show only older than today
'key' => 'xxp_agenda_date_end',
'value' => date("Y-m-d"), // consider using date_i18n() https://developer.wordpress.org/reference/functions/date_i18n/
'compare' => '>=', //show events before today
'type' => 'DATE',
)
)
)
);
?>
<?php if ( $the_query_archive_agenda->have_posts() ) : ?>
<?php while ( $the_query_archive_agenda->have_posts() ) : $the_query_archive_agenda->the_post(); ?>
<?php get_template_part( 'template-parts/section', 'each-agenda-entry' ); ?>
<?php endwhile;//end of the loop ?>
<?php
// pagination will not work for custom_query
// https://wordpress.stackexchange.com/a/120408
// how to fix it
the_posts_navigation();
?>
<?php wp_reset_postdata(); ?>
<?php endif; //end query convo ?>
</content>
</section>
</main><!-- #main -->
<?php
get_footer();

View File

@ -2,7 +2,7 @@
/**
* The template for displaying the "ajuts" funds with search capabilities
*
* Template Name: Cercador ajuts
* Template Name: Ajuts actuals cercador
*
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/
* @link https://developer.wordpress.org/themes/template-files-section/page-template-files/
@ -45,6 +45,7 @@ get_header();
</aside>
<content class="archive-posts archive-xarxaprod-fund archive-xarxapdor-ajut <?php //xarxaprod_class_posttype(); ?>">
<?php
// https://support.advancedcustomfields.com/forums/topic/wp_query-using-meta_query-for-an-acf-checkbox-field/#post-145830
// https://www.advancedcustomfields.com/resources/checkbox/#query-posts
@ -58,15 +59,14 @@ get_header();
);
?>
<?php if ( $the_query_ajut->have_posts() ) : ?>
<content class="archive-posts archive-xarxaprod-fund archive-xarxapdor-ajut <?php //xarxaprod_class_posttype(); ?>">
<?php while ( $the_query_ajut->have_posts() ) : $the_query_ajut->the_post(); ?>
<?php get_template_part( 'template-parts/section', 'eachfund' ); ?>
<?php endwhile;//end of the loop ?>
<?php wp_reset_postdata(); ?>
</content>
<?php endif; //end query ajut ?>
</content>
</section>

View File

@ -0,0 +1,150 @@
<?php
/**
* The template for displaying the "convos" calls with search capabilities
*
* Template Name: Arxiu general
*
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/
* @link https://developer.wordpress.org/themes/template-files-section/page-template-files/
*
* @package Xarxaprod_theme
* @since 1.0
*/
get_header();
?>
<!-- page-templates convos-search-php -->
<main id="primary" class="site-main">
<?php if ( have_posts() ) : ?>
<header class="page-header">
</header><!-- .page-header -->
<?php
while ( have_posts() ) :
the_post();
get_template_part( 'template-parts/content', 'page' );
endwhile;
the_posts_navigation();
else :
get_template_part( 'template-parts/content', 'none' );
endif;
?>
<section id="filteredcalls" class="xarxaprod-filtered-content xarxaprod-filtered-content xarxaprod-filtered-calls xarxaprod-convos-filtrats">
<aside id="callsfilter" class="xarxaprod-filter-calls xarxaprod-fitre-convos">
<?php include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); if ( is_plugin_active( 'xarxaprod-wp-plugin/xarxaprod-wp-plugin.php' ) ) { // if plugin active do?>
<?php xarxaprod_convos_filters_form(); // function defined in the plugin ?>
<?php } //end if is_plugin_active ?>
</aside>
<?php
// comparing dates
// https://wordpress.stackexchange.com/a/12305
$the_query_archive_convo = new WP_Query(
array(
'post_type' => 'xarxaprod-convo',
'order_by' => 'meta_value', //order by meta value
'meta_key' => 'xxp_convo_apply_end', // order by meta key convo apply end
'order' => 'ASC', //order ascendent
//'posts_per_page' => '-1', //show all
'posts_per_page' => '4',
'meta_query' => array(
array( //filter results show only older than today
'key' => 'xxp_convo_apply_end',
'value' => date("Y-m-d"), // consider using date_i18n() https://developer.wordpress.org/reference/functions/date_i18n/
'compare' => '<', //show events before today
'type' => 'DATE',
)
)
)
);
?>
<?php if ( $the_query_archive_convo->have_posts() ) : ?>
<content class="archive-posts archive-xarxaprod-convo <?php //xarxaprod_class_posttype(); ?>">
<?php while ( $the_query_archive_convo->have_posts() ) : $the_query_archive_convo->the_post(); ?>
<?php get_template_part( 'template-parts/section', 'eachconvo' ); ?>
<?php endwhile;//end of the loop ?>
<?php
// pagination will not work for custom_query
// https://wordpress.stackexchange.com/a/120408
// how to fix it
the_posts_navigation();
?>
<?php wp_reset_postdata(); ?>
</content>
<?php endif; //end query convo ?>
</section>
<section id="filteredagenda" class="xarxaprod-filtered-content xarxaprod-filtered-agenda xarxaprod-activitats-filtrats category-agenda xarxaprod-activitats">
<aside id="agendafilter" class="xarxaprod-filter-agenda xarxaprod-fitre-agenda">
<?php include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); if ( is_plugin_active( 'xarxaprod-wp-plugin/xarxaprod-wp-plugin.php' ) ) { // if plugin active do?>
<?php } //end if is_plugin_active ?>
<?php wp_nav_menu(
array(
'theme_location' => 'menu-3',
'menu_id' => 'agenda-menu',
)
); ?>
</aside>
<?php
$the_query_archive_agenda = new WP_Query(
array(
'post_type' => 'post',
'posts_per_page' => '4', //show all => -1
'tax_query' => array(
array(
'taxonomy' => 'category',
'field' => 'slug',
'terms' => 'activitats'
)
),
//'order_by' => 'meta_value', //order by meta value
//'meta_key' => 'xxp_convo_apply_end', // order by meta key convo apply end
'order' => 'ASC', //order ascendent
'meta_query' => array(
array( //filter results show only older than today
'key' => 'xxp_agenda_date_end',
'value' => date("Y-m-d"), // consider using date_i18n() https://developer.wordpress.org/reference/functions/date_i18n/
'compare' => '<', //show events before today
'type' => 'DATE',
)
)
)
);
?>
<?php if ( $the_query_archive_agenda->have_posts() ) : ?>
<content class="archive-posts <?php //xarxaprod_class_posttype(); ?>">
<?php while ( $the_query_archive_agenda->have_posts() ) : $the_query_archive_agenda->the_post(); ?>
<?php get_template_part( 'template-parts/section', 'each-agenda-entry' ); ?>
<?php endwhile;//end of the loop ?>
<?php
// pagination will not work for custom_query
// https://wordpress.stackexchange.com/a/120408
// how to fix it
the_posts_navigation();
?>
<?php wp_reset_postdata(); ?>
</content>
<?php endif; //end query convo ?>
</section>
</main><!-- #main -->
<?php
get_footer();

View File

@ -2,7 +2,7 @@
/**
* The template for displaying the "associats" associats with search capabilities
*
* Template Name: Cercador associats
* Template Name: Associats Cercador
*
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/
* @link https://developer.wordpress.org/themes/template-files-section/page-template-files/
@ -45,6 +45,7 @@ get_header();
</aside>
<content class="archive-posts archive-posts-map archive-xarxaprod-members archive-xarxaprod-associats <?php xarxaprod_class_posttype(); ?>">
<?php
// https://support.advancedcustomfields.com/forums/topic/wp_query-using-meta_query-for-an-acf-checkbox-field/#post-145830
// https://www.advancedcustomfields.com/resources/checkbox/#query-posts
@ -61,30 +62,38 @@ get_header();
?>
<?php if ( $the_query_associat->have_posts() ) : ?>
<content class="archive-posts archive-posts-map archive-xarxaprod-members archive-xarxaprod-associats <?php xarxaprod_class_posttype(); ?>">
<figure id="espais-associats-map" class="xarxaprod-associats-map xarxaprod-espais-map">
<figure id="espais-associats-map" class="xarxaprod-associats-map xarxaprod-espais-map">
<?php xarxaprod_show_leaflet_map(); // function defined in the plugin ?>
<?php xarxaprod_show_leaflet_map(); // function defined in the plugin ?>
<?php while ( $the_query_associat->have_posts() ) : $the_query_associat->the_post(); ?>
<?php while ( $the_query_associat->have_posts() ) : $the_query_associat->the_post(); ?>
<?php xarxaprod_show_leaflet_associat_blob(); ?>
<?php xarxaprod_show_leaflet_associat_blob(); ?>
<?php endwhile;//end of the loop ?>
<?php endwhile;//end of the loop ?>
</figure>
<?php wp_reset_postdata(); ?>
</content>
<?php
//the loop for text output
//echo '<content class="archive-posts archive-xarxaprod-members archive-xarxaprod-associats' . xarxaprod_class_posttype() . '">';
//while ( $the_query_associat->have_posts() ) : $the_query_associat->the_post();
//get_template_part( 'template-parts/section', 'eachmember' );
//endwhile;//end of the loop
//echo '</content>';
?>
<?php endif; //end query associat ?>
</figure>
<?php
// nuvol de nomb sde fabriques
echo '<ul class="xarxaprod-label">';
while ( $the_query_associat->have_posts() ) : $the_query_associat->the_post();
echo '<li>';
echo '<a href="';
the_permalink();
echo '" title="';
the_title();
echo '" rel="bookmark">';
the_title();
echo '</a>';
echo '</li>';
endwhile;
echo '</ul>';
?>
<?php wp_reset_postdata(); ?>
<?php endif; //end query associat ?>
</content>
</section>
</main><!-- #main -->

View File

@ -2,7 +2,7 @@
/**
* The template for displaying the "convos" calls with search capabilities
*
* Template Name: Arxiu convos antigues
* Template Name: Convos antigues arxiu
*
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/
* @link https://developer.wordpress.org/themes/template-files-section/page-template-files/

View File

@ -2,7 +2,7 @@
/**
* The template for displaying the "convos" calls with search capabilities
*
* Template Name: Cercador convos
* Template Name: Convos actuals cercador
*
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/
* @link https://developer.wordpress.org/themes/template-files-section/page-template-files/
@ -43,6 +43,7 @@ get_header();
<?php } //end if is_plugin_active ?>
</aside>
<content class="archive-posts archive-xarxaprod-convo <?php //xarxaprod_class_posttype(); ?>">
<?php
// https://support.advancedcustomfields.com/forums/topic/wp_query-using-meta_query-for-an-acf-checkbox-field/#post-145830
// https://www.advancedcustomfields.com/resources/checkbox/#query-posts
@ -66,15 +67,14 @@ get_header();
);
?>
<?php if ( $the_query_convo->have_posts() ) : ?>
<content class="archive-posts archive-xarxaprod-convo <?php //xarxaprod_class_posttype(); ?>">
<?php while ( $the_query_convo->have_posts() ) : $the_query_convo->the_post(); ?>
<?php get_template_part( 'template-parts/section', 'eachconvo' , $the_query_convo); ?>
<?php endwhile;//end of the loop ?>
<?php wp_reset_postdata(); ?>
</content>
<?php endif; //end query convo ?>
</content>
</section>
</main><!-- #main -->

View File

@ -2,7 +2,7 @@
/**
* The template for displaying the "ajuts" funds with search capabilities
*
* Template Name: PAFs, consells, tutorials...
* Template Name: PAFs, FAQs, consells, tutorials...
*
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/
* @link https://developer.wordpress.org/themes/template-files-section/page-template-files/

View File

@ -1,53 +0,0 @@
<?php
/**
* The template for page declared as front-page
*
*
* @link https://developer.wordpress.org/themes/template-files-section/page-template-files/
*
* @package Xarxaprod_theme
*/
get_header();
?>
<main id="primary" class="site-main">
<?php
if ( have_posts() ) :
if ( is_home() && ! is_front_page() ) :
?>
<header>
<h1 class="page-title screen-reader-text"><?php single_post_title(); ?></h1>
</header>
<?php
endif;
/* Start the Loop */
while ( have_posts() ) :
the_post();
/*
* Include the Post-Type-specific template for the content.
* If you want to override this in a child theme, then include a file
* called content-___.php (where ___ is the Post Type name) and that will be used instead.
*/
get_template_part( 'template-parts/content', get_post_type() );
endwhile;
the_posts_navigation();
else :
get_template_part( 'template-parts/content', 'none' );
endif;
?>
</main><!-- #main -->
<?php
get_sidebar();
get_footer();

View File

@ -265,9 +265,7 @@
.archive-posts {
grid-template-columns: repeat(2 , 1fr);
min-height: 40vh;
}
.post-type-archive-xarxaprod-associat {
.archive-posts {
&.archive-posts-map,&.archive-xarxaprod-members,&archive-xarxaprod-associats {
grid-template-columns: 1fr;
}
}

View File

@ -5,7 +5,7 @@ Theme URI: https://git.hangar.org/xarxaprod/
Author: Hangar.org Tech Lab - hangar.org
Author URI: https://hangar.org
Description: theme for the <a href="https://xarxaprod.cat">XarxaProd</a>. Inclou la possibilitat de publicar, catalogar i cercar ajuts, resoldre dubtes amb FAQs i altres. Design by Eudald Van der Pla <a href="https://vanderpla.com">vanderpla.com</a>. Coding template and theme by <a href="https://vitrubio.net">Jorge - vitrubio.net</a>
Version: 1.6.1
Version: 1.6.5
Tested up to: 6.4
Requires PHP: 7.4
License: GNU General Public License v3 or later

View File

@ -5,7 +5,7 @@ Theme URI: https://git.hangar.org/xarxaprod/
Author: Hangar.org Tech Lab - hangar.org
Author URI: https://hangar.org
Description: theme for the <a href="https://xarxaprod.cat">XarxaProd</a>. Inclou la possibilitat de publicar, catalogar i cercar ajuts, resoldre dubtes amb FAQs i altres. Design by Eudald Van der Pla <a href="https://vanderpla.com">vanderpla.com</a>. Coding template and theme by <a href="https://vitrubio.net">Jorge - vitrubio.net</a>
Version: 1.6.1
Version: 1.6.5
Tested up to: 6.4
Requires PHP: 7.4
License: GNU General Public License v3 or later
@ -1606,7 +1606,9 @@ textarea {
min-height: 40vh;
}
.post-type-archive-xarxaprod-associat .archive-posts {
.archive-posts.archive-posts-map,
.archive-posts.archive-xarxaprod-members,
.archive-postsarchive-xarxaprod-associats {
grid-template-columns: 1fr;
}

File diff suppressed because one or more lines are too long