Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Contributor attendance mode #369

Merged
merged 17 commits into from
Nov 19, 2024
Merged

Contributor attendance mode #369

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d7957dc
Add remote icon block
trymebytes Oct 10, 2024
9834b08
Use remote icon block in attendee and contributor list
trymebytes Oct 10, 2024
a48b05e
Position the video icon
trymebytes Oct 14, 2024
3ca5fc0
Rename block to remote-attendance-block
trymebytes Oct 14, 2024
98aad7e
Allow applying custom inline css
trymebytes Oct 14, 2024
109dc8c
Add icon to identify remote events
trymebytes Oct 14, 2024
f3ed379
Reset counter
trymebytes Nov 11, 2024
e85ee7e
Use grid block
trymebytes Nov 12, 2024
3c7e0a0
Use grid for attendee list
trymebytes Nov 12, 2024
9cea88b
Update styling of remote icon
trymebytes Nov 13, 2024
49fe747
Use css class to position icon
trymebytes Nov 13, 2024
d76ce12
Update css class name
trymebytes Nov 13, 2024
13e83c5
Update class name
trymebytes Nov 13, 2024
7813876
Fix indentations
trymebytes Nov 18, 2024
be82991
Merge pull request #377 from WordPress/remote-event-icon
trymebytes Nov 18, 2024
23e39c2
Use tab not space
trymebytes Nov 19, 2024
8e9a0a9
Fix more indentations
trymebytes Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 26 additions & 33 deletions themes/wporg-translate-events-2024/blocks/attendee-list/render-list.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,32 @@
?>
</h4>
<!-- /wp:heading -->
<!-- wp:group {"align":"full"} -->
<div class="wp-block-group alignfull">
<!-- wp:columns {"columns":3} -->
<div class="wp-block-columns has-3-columns">
<?php
$columns = 3;
$counter = 0;

foreach ( $attendees_not_contributing as $attendee ) :
if ( $columns === $counter ) :
?>
</div><!-- /wp:columns -->
<!-- wp:columns {"columns":3} --><div class="wp-block-columns has-3-columns">
<?php
endif;
?>
<!-- wp:wporg-translate-events-2024/attendee-avatar-name
<!-- wp:group {"layout":{"type":"grid","columnCount":3,"minimumColumnWidth":null}} -->
<div class="wp-block-group">
<?php
echo wp_json_encode(
array(
'user_id' => $attendee->user_id(),
'is_new_contributor' => $attendee->is_new_contributor(),
)
);
foreach ( $attendees_not_contributing as $attendee ) :
?>
<!-- wp:group -->
<div class="wp-block-group">
<!-- wp:wporg-translate-events-2024/attendee-avatar-name
<?php
echo wp_json_encode(
array(
'user_id' => $attendee->user_id(),
'is_new_contributor' => $attendee->is_new_contributor(),
)
);
?>
/-->
<?php if ( $attendee->is_remote() ) : ?>
<!-- wp:wporg-translate-events-2024/remote-attendance-icon <?php echo wp_json_encode( array( 'css_class' => 'video-icon-on-gravatar' ) ); ?> /-->
<?php endif; ?>
</div>
<!-- /wp:group -->

<?php
endforeach;
?>
/-->
<!-- wp:column -->
<div class="wp-block-column">
</div>
<!-- /wp:column -->
<?php
++$counter;
endforeach;
?>
</div><!-- /wp:columns -->
</div><!-- /wp:group -->
</div>
<!-- /wp:group -->
61 changes: 27 additions & 34 deletions themes/wporg-translate-events-2024/blocks/contributor-list/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,42 +35,35 @@ function ( Attendee $attendee ) {
?>
</h4>
<!-- /wp:heading -->
<!-- wp:group {"align":"full"} -->
<div class="wp-block-group alignfull">
<!-- wp:columns {"columns":3} -->
<div class="wp-block-columns has-3-columns">
<?php
$columns = 3;
$counter = 0;

foreach ( $contributors as $contributor ) :
if ( $columns === $counter ) :
?>
</div><!-- /wp:columns -->
<!-- wp:columns {"columns":3} --><div class="wp-block-columns has-3-columns">
<?php
endif;
?>
<!-- wp:wporg-translate-events-2024/attendee-avatar-name

<!-- wp:group {"layout":{"type":"grid","columnCount":3,"minimumColumnWidth":null}} -->
<div class="wp-block-group">
<?php
echo wp_json_encode(
array(
'user_id' => $contributor->user_id(),
'is_new_contributor' => $contributor->is_new_contributor(),
)
);
foreach ( $contributors as $contributor ) :
?>
<!-- wp:group -->
<div class="wp-block-group">
<!-- wp:wporg-translate-events-2024/attendee-avatar-name
<?php
echo wp_json_encode(
array(
'user_id' => $contributor->user_id(),
'is_new_contributor' => $contributor->is_new_contributor(),
)
);
?>
/-->
<?php if ( $contributor->is_remote() ) : ?>
<!-- wp:wporg-translate-events-2024/remote-attendance-icon <?php echo wp_json_encode( array( 'css_class' => 'video-icon-on-gravatar' ) ); ?> /-->
<?php endif; ?>
</div>
<!-- /wp:group -->

<?php
endforeach;
?>
/-->
<!-- wp:column -->
<div class="wp-block-column">
</div>
<!-- /wp:column -->
<?php
$counter++;
endforeach;
?>
</div><!-- /wp:columns -->
</div><!-- /wp:group -->
</div>
<!-- /wp:group -->
<?php
return ob_get_clean();
},
Expand Down
6 changes: 6 additions & 0 deletions themes/wporg-translate-events-2024/blocks/event-title/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
}
$url = Urls::event_details( $event->id() );
?>
<?php
if ( 'remote' === $event->attendance_mode() ) {
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
echo do_blocks( sprintf( '<!-- wp:wporg-translate-events-2024/remote-attendance-icon %s /-->', wp_json_encode( array( 'inline_css' => 'float:left; margin-right:3px' ) ) ) );
}
?>
<h3 class="wporg-marker-list-item__title">
<a href="<?php echo esc_url( $url ); ?>">
<?php echo esc_html( $event->title() ); ?>
Expand Down
14 changes: 14 additions & 0 deletions themes/wporg-translate-events-2024/blocks/remote-attendance-icon/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php
namespace Wporg\TranslationEvents\Theme_2024;

register_block_type(
'wporg-translate-events-2024/remote-attendance-icon',
array(
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.Found
'render_callback' => function ( $attributes ) {
$css_class = isset( $attributes['css_class'] ) ? esc_attr( $attributes['css_class'] ) : '';

return sprintf( '<span class="dashicons dashicons-video-alt2 %s"></span>', $css_class );
},
)
);
1 change: 1 addition & 0 deletions themes/wporg-translate-events-2024/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ function register_blocks(): void {
include_once __DIR__ . '/blocks/pages/events/event-create/index.php';
include_once __DIR__ . '/blocks/event-form/index.php';
include_once __DIR__ . '/blocks/pages/events/event-edit/index.php';
include_once __DIR__ . '/blocks/remote-attendance-icon/index.php';
}

function register_patterns(): void {
Expand Down
27 changes: 27 additions & 0 deletions themes/wporg-translate-events-2024/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,33 @@ select.wp-block-form-input__input {
background-color: #46b450;
}

span.user-remote-icon.dashicons-video-alt2 {
margin-left: -8.8%;
margin-top: 32px;
color: var(--wp--preset--color--blueberry-1);
}

.wp-block-group.is-layout-grid {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 20px;
}

.video-icon-on-gravatar {
display: inline-flex;
align-items: center;
justify-content: center;
width: 20px;
height: 20px;
border-radius: 50%;
background-color: white;
color: #555;
font-size: 14px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
margin-top: -14px;
margin-left: 14px;
}

@media (min-width: 960px) {

.wporg-marker-list__container .wporg-marker-list-item {
Expand Down
Loading