Skip to content

GitLab

Commit db38d39f authored by Matthieu FAURE's avatar Matthieu FAURE ⛵
Browse files

Merge branch '48-nombre-de-personnes-incrites-a-un-evenement-pas-deja-fait' into 'master' 

Resolve "nombre de personnes incrites à un évènement (pas déjà fait ?)"

Closes #48

See merge request !31
parents 52dabf39 d61ac641
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 70 deletions
category-membres.php
View file @ db38d39f
......@@ -29,7 +29,7 @@ $max_member_numero = ($page * $maxMembersPerPage);
?>
<div class="wrap">
<main id="main" class="site-main" role="main">
<div id="adullact-sort-buttons">
<div class="adullact-line">
<div id="adullact-sort-by-type-buttons">
<ul class="adullact-member-list">
<?php
......
style.css
View file @ db38d39f
......@@ -88,11 +88,6 @@ erreur (rouge) : red
/*Liste des adhérents*/
/*************************************************************/
#adullact-sort-buttons {
display: flex;
flex-direction: row;
}
.adullact-members-list {
display: flex;
flex-direction: row;
......@@ -101,12 +96,6 @@ erreur (rouge) : red
justify-content: flex-start;
}
.adullact-line {
display: flex;
flex-direction: row;
justify-content: flex-start;
}
.adullact-member {
word-wrap: break-spaces;
margin: 10px;
......@@ -392,4 +381,13 @@ que comme cela
#adullact-contact-informations {
text-align: center;
padding: 7px;
}
.adullact-line {
display: flex;
flex-direction: row;
}
.adullact-spaced-line{
display: flex;
flex-direction: row;
justify-content: space-between;
}
\ No newline at end of file
tribe-events/single-event.php
View file @ db38d39f
......@@ -11,79 +11,79 @@
*
*/
if ( ! defined( 'ABSPATH' ) ) {
die( '-1' );
if (!defined('ABSPATH')) {
die('-1');
}
$events_label_singular = tribe_get_event_label_singular();
$events_label_plural = tribe_get_event_label_plural();
$events_label_plural = tribe_get_event_label_plural();
$event_id = get_the_ID();
?>
function get_nombre_inscriptions()
{
$event_id = get_the_ID();
$event_meta = rtec_get_event_meta($event_id);
if($event_meta['num_registered']>1){
echo '<div class="tribe-events-event-cost rtec-custom-limit rtec-red"><span>' . $event_meta['num_registered'] . ' inscrits</span></div>';
}
else{
echo '<div class="tribe-events-event-cost rtec-custom-limit rtec-red"><span>' . $event_meta['num_registered'] . ' inscrit</span></div>';
}
}
?>
<div id="tribe-events-content" class="tribe-events-single">
<p class="tribe-events-back">
<a href="<?php echo esc_url(tribe_get_events_link()); ?>"> <?php printf('&laquo; ' . esc_html_x('All %s', '%s Events plural label', 'the-events-calendar'), $events_label_plural); ?></a>
</p>
<p class="tribe-events-back">
<a href="<?php echo esc_url( tribe_get_events_link() ); ?>"> <?php printf( '&laquo; ' . esc_html_x( 'All %s', '%s Events plural label', 'the-events-calendar' ), $events_label_plural ); ?></a>
</p>
<!-- Notices -->
<?php tribe_the_notices() ?>
<?php the_title( '<h1 class="tribe-events-single-event-title">', '</h1>' ); ?>
<div class="tribe-events-schedule tribe-clearfix">
<?php echo tribe_events_event_schedule_details( $event_id, '<h2>', '</h2>' ); ?>
<?php if ( tribe_get_cost() ) : ?>
<span class="tribe-events-cost"><?php echo tribe_get_cost( null, true ) ?></span>
<?php endif; ?>
</div>
<!-- Notices -->
<?php tribe_the_notices() ?>
<!-- Event header -->
<div id="tribe-events-header" <?php tribe_events_the_header_attributes() ?>>
<!-- Navigation -->
<nav class="tribe-events-nav-pagination" aria-label="<?php printf( esc_html__( '%s Navigation', 'the-events-calendar' ), $events_label_singular ); ?>">
<ul class="tribe-events-sub-nav">
<li class="tribe-events-nav-previous"><?php tribe_the_prev_event_link( '<span>&laquo;</span> %title%' ) ?></li>
<li class="tribe-events-nav-next"><?php tribe_the_next_event_link( '%title% <span>&raquo;</span>' ) ?></li>
</ul>
<!-- .tribe-events-sub-nav -->
</nav>
</div>
<!-- #tribe-events-header -->
<?php the_title('<h1 class="tribe-events-single-event-title">', '</h1>'); ?>
<div class="tribe-events-schedule tribe-clearfix">
<div class="adullact-spaced-line">
<?php echo tribe_events_event_schedule_details($event_id, '<h2>', '</h2>'); ?>
<?php get_nombre_inscriptions(); ?>
</div>
<?php if (tribe_get_cost()) : ?>
<span class="tribe-events-cost"><?php echo tribe_get_cost(null, true) ?></span>
<?php endif; ?>
</div>
<?php while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<!-- Event featured image, but exclude link -->
<?php echo tribe_event_featured_image( $event_id, 'full', false ); ?>
<?php while (have_posts()) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<!-- Event featured image, but exclude link -->
<?php echo tribe_event_featured_image($event_id, 'full', false); ?>
<!-- Event meta -->
<?php do_action( 'tribe_events_single_event_before_the_meta' ) ?>
<?php tribe_get_template_part( 'modules/meta' ); ?>
<?php do_action( 'tribe_events_single_event_after_the_meta' ) ?>
<!-- Event meta -->
<?php do_action('tribe_events_single_event_before_the_meta') ?>
<?php tribe_get_template_part('modules/meta'); ?>
<?php do_action('tribe_events_single_event_after_the_meta') ?>
<!-- Event content -->
<?php do_action( 'tribe_events_single_event_before_the_content' ) ?>
<?php do_action('tribe_events_single_event_before_the_content') ?>
<div class="tribe-events-single-event-description tribe-events-content">
<?php the_content(); ?>
</div>
<!-- .tribe-events-single-event-description -->
</div> <!-- #post-x -->
<?php if ( get_post_type() == Tribe__Events__Main::POSTTYPE && tribe_get_option( 'showComments', false ) ) comments_template() ?>
<?php endwhile; ?>
</div> <!-- #post-x -->
<?php if (get_post_type() == Tribe__Events__Main::POSTTYPE && tribe_get_option('showComments', false)) comments_template() ?>
<?php endwhile; ?>
<!-- Event footer -->
<div id="tribe-events-footer">
<!-- Navigation -->
<nav class="tribe-events-nav-pagination" aria-label="<?php printf( esc_html__( '%s Navigation', 'the-events-calendar' ), $events_label_singular ); ?>">
<ul class="tribe-events-sub-nav">
<li class="tribe-events-nav-previous"><?php tribe_the_prev_event_link( '<span>&laquo;</span> %title%' ) ?></li>
<li class="tribe-events-nav-next"><?php tribe_the_next_event_link( '%title% <span>&raquo;</span>' ) ?></li>
</ul>
<!-- .tribe-events-sub-nav -->
</nav>
</div>
<!-- #tribe-events-footer -->
<!-- Event footer -->
<div id="tribe-events-footer">
<!-- Navigation -->
<nav class="tribe-events-nav-pagination"
aria-label="<?php printf(esc_html__('%s Navigation', 'the-events-calendar'), $events_label_singular); ?>">
<ul class="tribe-events-sub-nav">
<li class="tribe-events-nav-previous"><?php tribe_the_prev_event_link('<span>&laquo;</span> %title%') ?></li>
<li class="tribe-events-nav-next"><?php tribe_the_next_event_link('%title% <span>&raquo;</span>') ?></li>
</ul>
<!-- .tribe-events-sub-nav -->
</nav>
</div>
<!-- #tribe-events-footer -->
</div><!-- #tribe-events-content -->
\ No newline at end of file
tribe-events/tribe-events.css
View file @ db38d39f
/*"Aucun résultat : on cache car inutile*/
.tribe-events-notices{
display:none;
.tribe-events-event-cost span {
border: none;
font-weight: normal;
margin:0;
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment