xarxaprod
/
xarxaprod-wp-theme
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xarxaprod:0ee5eadd603ff8fe64804893a1cc38e5087122b4
Branches Tags
xarxaprod:main
xarxaprod:dev
xarxaprod:db-fields-migration
xarxaprod:ofsupimport
..
compare: xarxaprod:1dd1cd99ea808be4cb0f02113a2344b18a40de07
Branches Tags
xarxaprod:dev
xarxaprod:main
xarxaprod:db-fields-migration
xarxaprod:ofsupimport

No commits in common. "0ee5eadd603ff8fe64804893a1cc38e5087122b4" and "1dd1cd99ea808be4cb0f02113a2344b18a40de07" have entirely different histories.
0ee5eadd60 ... 1dd1cd99ea

11 changed files with 156 additions and 214 deletions
Show Stats Expand all files Collapse all files

19
adminstyles.css
View File

@ -17,7 +17,7 @@ Theme URI: https://git.hangar.org/xarxaprod/
Author: Hangar Tech Lab Author: Hangar Tech Lab
Author URI: https://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> 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.7.7 Version: 1.7.6
Tested up to: 6.5.2 Tested up to: 6.5.2
Requires PHP: 7.4 Requires PHP: 7.4
License: GNU General Public License v3 or later License: GNU General Public License v3 or later
@ -2396,10 +2396,6 @@ Add your custom styles in this file so it is easier to update the theme.
/* mapas leaflet associats */ /* mapas leaflet associats */
/*
* Arxiu
* */
/* /*
* categories: * categories:
* convocatorias pre 2024 * convocatorias pre 2024
@ -2799,19 +2795,6 @@ Add your custom styles in this file so it is easier to update the theme.
aspect-ratio: 16 / 9; aspect-ratio: 16 / 9;
} }
.editor-styles-wrapper .xarxaprod-filtered-arxiu > header {
grid-column: -1 / 1;
}
.editor-styles-wrapper .xarxaprod-filtered-arxiu > aside {
grid-column: -1 / 1;
}
.editor-styles-wrapper .xarxaprod-filtered-arxiu > .archive-posts {
grid-column: -1 / 1;
grid-template-columns: repeat(3, 1fr);
}
.editor-styles-wrapper .archive.category-convocatories main > aside { .editor-styles-wrapper .archive.category-convocatories main > aside {
grid-column: -1 / 1; grid-column: -1 / 1;
} }

2
adminstyles.css.map
View File

File diff suppressed because one or more lines are too long

43
archive.php
View File

@ -47,23 +47,42 @@ get_header();
the_posts_navigation(); the_posts_navigation();
//end if is_category faq //end if is_category faq
} elseif (in_category( array( 'activitats') ) ) { } elseif (in_category( array( 'activitats') ) ) {
//get_template_part( 'template-parts/section', 'each-agenda-entry' );
function xxp_order_by_date_end( $query ){ $the_query_archive_activitats = new WP_Query(
if ( ! is_admin() && $query->is_main_query() ){ array(
$query->set( 'order_by', 'meta_value' ); //'post_type' => 'post',
$query->set( 'order', 'ASC' ); //'posts_per_page' => '-1', //show all => -1
$query->set( 'meta_query', array( //'tax_query' => array(
array( // array(
// 'taxonomy' => 'category',
// 'field' => 'slug',
// 'terms' => 'activitats'
// )
//),
'meta_query' => array(
array( //filter results show only older than today
'key' => 'xxp_agenda_date_end', 'key' => 'xxp_agenda_date_end',
'value' => date("Y-m-d"), 'value' => date("Y-m-d"), // consider using date_i18n() https://developer.wordpress.org/reference/functions/date_i18n/
'compare' => '>', //show events before today 'compare' => '>', //show events before today
'type' => 'DATE', 'type' => 'DATE',
) )
) ); ),
} 'order_by' => 'meta_value', //order by meta value
} 'order' => 'ASC', //order ascendent
add_action( 'pre_get_posts', 'xxp_order_by_date_end'); )
get_template_part( 'template-parts/section', 'each-agenda-entry' ); );
if ( $the_query_archive_activitats->have_posts() ) :
while ( $the_query_archive_activitats->have_posts() ) : $the_query_archive_activitats->the_post();
get_template_part( 'template-parts/section', 'each-agenda-entry' );
endwhile;//end of the loop
// pagination will not work for custom_query, why and fix: https://wordpress.stackexchange.com/a/120408
// the_posts_navigation();
endif; //end if the_query_archive_activitats
wp_reset_postdata(); //reset custom query
//end in_category agenda activitats //end in_category agenda activitats
} elseif (in_category( array( 'convocatories') ) ) { } elseif (in_category( array( 'convocatories') ) ) {

2
assets/css/adminstyles.css
View File

File diff suppressed because one or more lines are too long

96
page-templates/agenda-archive.php Normal file
View File

@ -0,0 +1,96 @@
<?php
/**
* The template for displaying the "agenda" activities with search capabilities
*
* 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/
*
* @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>
<?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_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_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();

93
page-templates/arxiu-activitats.php
View File

@ -1,93 +0,0 @@
<?php
/**
* The template for displaying the "convos" calls with search capabilities
*
* Template Name: Arxiu Activitats
*
* @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="arxiuactivitats" class="xarxaprod-filtered-content xarxaprod-filtered-arxiu xarxaprod-arxiu-agenda xarxaprod-arxiu-activitats">
<header>
</header>
<aside id="agendafilter" class="xarxaprod-filter-agenda xarxaprod-fitre-agenda">
</aside>
<?php
$the_query_archive_activitats = new WP_Query(
array(
'post_type' => 'post',
'posts_per_page' => '-1', //show all => -1
'tax_query' => array(
array(
'taxonomy' => 'category',
'field' => 'slug',
'terms' => 'activitats'
)
),
'order_by' => 'meta_value', //order by meta value
'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_activitats->have_posts() ) : ?>
<content class="archive-posts <?php //xarxaprod_class_posttype(); ?>">
<?php while ( $the_query_archive_activitats->have_posts() ) : $the_query_archive_activitats->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 agenda ?>
</section>
</main><!-- #main -->
<?php
get_footer();

68
page-templates/arxiu-general.php
View File

@ -36,19 +36,27 @@ get_header();
endif; endif;
?> ?>
<section id="filteredagenda" class="xarxaprod-filtered-content xarxaprod-filtered-arxiu xarxaprod-arxiu-agenda xarxaprod-arxiu-activitats"> <section id="filteredagenda" class="xarxaprod-filtered-content xarxaprod-filtered-agenda xarxaprod-activitats-filtrats category-agenda xarxaprod-activitats">
<header> <header>
<h2 class="section-title"><a href="<?php echo site_url(); ?>/arxiu-activitats">Activitats pasades</a></h2> <h2 class="section-title"><a href="#">Activitats pasades</a></h2>
</header> </header>
<aside id="agendafilter" class="xarxaprod-filter-agenda xarxaprod-fitre-agenda"> <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> </aside>
<?php <?php
$the_query_archive_agenda = new WP_Query( $the_query_archive_agenda = new WP_Query(
array( array(
'post_type' => 'post', 'post_type' => 'post',
'posts_per_page' => '3', //show all => -1 'posts_per_page' => '4', //show all => -1
'tax_query' => array( 'tax_query' => array(
array( array(
'taxonomy' => 'category', 'taxonomy' => 'category',
@ -57,6 +65,7 @@ get_header();
) )
), ),
'order_by' => 'meta_value', //order by meta value '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 'order' => 'ASC', //order ascendent
'meta_query' => array( 'meta_query' => array(
array( //filter results show only older than today array( //filter results show only older than today
@ -84,15 +93,18 @@ get_header();
?> ?>
<?php wp_reset_postdata(); ?> <?php wp_reset_postdata(); ?>
</content> </content>
<?php endif; //end query agenda ?> <?php endif; //end query convo ?>
</section> </section>
<section id="filteredcalls" class="xarxaprod-filtered-content xarxaprod-filtered-arxiu xarxaprod-arxiu-convos"> <section id="filteredcalls" class="xarxaprod-filtered-content xarxaprod-filtered-content xarxaprod-filtered-calls xarxaprod-convos-filtrats">
<header> <header>
<h2 class="section-title"><a href="<?php echo site_url(); ?>/arxiu-convocatories">Convocatories pasades</a></h2> <h2 class="section-title"><a href="#">Convocatories</a></h2>
</header> </header>
<aside id="callsfilter" class="xarxaprod-filter-calls xarxaprod-fitre-convos"> <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> </aside>
<?php <?php
@ -105,7 +117,7 @@ get_header();
'meta_key' => 'xxp_convo_apply_end', // order by meta key convo apply end 'meta_key' => 'xxp_convo_apply_end', // order by meta key convo apply end
'order' => 'ASC', //order ascendent 'order' => 'ASC', //order ascendent
//'posts_per_page' => '-1', //show all //'posts_per_page' => '-1', //show all
'posts_per_page' => '3', 'posts_per_page' => '4',
'meta_query' => array( 'meta_query' => array(
array( //filter results show only older than today array( //filter results show only older than today
'key' => 'xxp_convo_apply_end', 'key' => 'xxp_convo_apply_end',
@ -135,48 +147,6 @@ get_header();
<?php endif; //end query convo ?> <?php endif; //end query convo ?>
</section> </section>
<section id="filteredcalls-pre2024" class="xarxaprod-filtered-content xarxaprod-filtered-content xarxaprod-filtered-calls xarxaprod-convos-filtrats">
<header>
<h2 class="section-title"><a href="<?php echo site_url(); ?>/convocatories-pre-2024/">Convocatories pre 2024</a></h2>
</header>
<aside id="callsfilter" class="xarxaprod-filter-calls xarxaprod-fitre-convos">
</aside>
<?php
// comparing dates
// https://wordpress.stackexchange.com/a/12305
$the_query_archive_convopre2024 = new WP_Query(
// uncomment below to activate preview of pre 2024 convos
// array(
// 'post_type' => 'post',
// 'posts_per_page' => '4', //show all => -1
// 'tax_query' => array(
// array(
// 'taxonomy' => 'category',
// 'field' => 'slug',
// 'terms' => 'convocatories'
// )
// ),
// )
// uncomment above to activate preview of pre 2024 convos
);
?>
<?php if ( $the_query_archive_convopre2024->have_posts() ) : ?>
<content class="archive-posts category-convocatoriespre2024">
<?php while ( $the_query_archive_convopre2024->have_posts() ) : $the_query_archive_convopre2024->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 convopre2024 ?>
</section>
</main><!-- #main --> </main><!-- #main -->

13
page-templates/arxiu-convos.php → page-templates/convos-archive.php
View File

@ -2,7 +2,7 @@
/** /**
* The template for displaying the "convos" calls with search capabilities * The template for displaying the "convos" calls with search capabilities
* *
* Template Name: Arxiu Convos * Template Name: Convos antigues arxiu
* *
* @link https://developer.wordpress.org/themes/basics/template-hierarchy/ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
* @link https://developer.wordpress.org/themes/template-files-section/page-template-files/ * @link https://developer.wordpress.org/themes/template-files-section/page-template-files/
@ -35,13 +35,12 @@ get_header();
endif; endif;
?> ?>
<section id="filteredcalls" class="xarxaprod-filtered-content xarxaprod-filtered-content xarxaprod-filtered-calls xarxaprod-convos-filtrats">
<section id="filteredcalls" class="xarxaprod-filtered-content xarxaprod-filtered-arxiu xarxaprod-arxiu-convos">
<aside id="callsfilter" class="xarxaprod-filter-calls xarxaprod-fitre-convos"> <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 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 xarxaprod_convos_filters_form(); // function defined in the plugin ?>
<?php //} //end if is_plugin_active ?> <?php } //end if is_plugin_active ?>
</aside> </aside>
<?php <?php

16
sass/components/content/_posts-and-pages.scss
View File

@ -386,22 +386,6 @@
aspect-ratio: 16 / 9; aspect-ratio: 16 / 9;
} }
} }
/*
* Arxiu
* */
.xarxaprod-filtered-arxiu {
> header {
grid-column: -1 / 1;
}
> aside {
grid-column: -1 / 1;
}
> .archive-posts {
grid-column: -1 / 1;
grid-template-columns: repeat(3, 1fr);
}
}
/* /*
* categories: * categories:
* convocatorias pre 2024 * convocatorias pre 2024

16
style.css
View File

@ -2627,22 +2627,6 @@ textarea {
aspect-ratio: 16 / 9; aspect-ratio: 16 / 9;
} }
/*
* Arxiu
* */
.xarxaprod-filtered-arxiu > header {
grid-column: -1 / 1;
}
.xarxaprod-filtered-arxiu > aside {
grid-column: -1 / 1;
}
.xarxaprod-filtered-arxiu > .archive-posts {
grid-column: -1 / 1;
grid-template-columns: repeat(3, 1fr);
}
/* /*
* categories: * categories:
* convocatorias pre 2024 * convocatorias pre 2024

2
style.css.map
View File

File diff suppressed because one or more lines are too long