| @@ -21,9 +21,8 @@ | ||
| 21 | 21 | $selected_comment = $attributes['selectedComment'] ?? ''; |
| 22 | 22 | |
| 23 | 23 | // Generate a unique ID for the block. |
| 24 | 24 | $block_id = 'activitypub-remote-reply-block-' . wp_unique_id(); |
| 25 | -$error_id = $block_id . '-remote-profile-error'; | |
| 26 | 25 | |
| 27 | 26 | // Set up the Interactivity API config. |
| 28 | 27 | wp_interactivity_config( |
| 29 | 28 | 'activitypub/remote-reply', |
| @@ -77,9 +76,9 @@ | ||
| 77 | 76 | ?> |
| 78 | 77 | <div class="activitypub-dialog__section"> |
| 79 | 78 | <h4><?php esc_html_e( 'Original Comment URL', 'activitypub' ); ?></h4> |
| 80 | 79 | <div class="activitypub-dialog__description"> |
| 81 | - <?php esc_html_e( 'Paste the comment URL into the search field of your favorite open social app or platform.', 'activitypub' ); ?> | |
| 80 | + <?php esc_html_e( 'Copy and paste the Comment URL into the search field of your favorite fediverse app or server.', 'activitypub' ); ?> | |
| 82 | 81 | </div> |
| 83 | 82 | <div class="activitypub-dialog__button-group"> |
| 84 | 83 | <label for="<?php echo esc_attr( $block_id . '-profile-handle' ); ?>" class="screen-reader-text"> |
| 85 | 84 | <?php esc_html_e( 'Comment URL', 'activitypub' ); ?> |
| @@ -85,9 +84,8 @@ | ||
| 85 | 84 | <?php esc_html_e( 'Comment URL', 'activitypub' ); ?> |
| 86 | 85 | </label> |
| 87 | 86 | <input |
| 88 | 87 | aria-readonly="true" |
| 89 | - class="wp-block-search__input" | |
| 90 | 88 | id="<?php echo esc_attr( $block_id . '-profile-handle' ); ?>" |
| 91 | 89 | readonly |
| 92 | 90 | tabindex="-1" |
| 93 | 91 | type="text" |
| @@ -94,9 +92,9 @@ | ||
| 94 | 92 | value="<?php echo esc_attr( $selected_comment ); ?>" |
| 95 | 93 | /> |
| 96 | 94 | <button |
| 97 | 95 | aria-label="<?php esc_attr_e( 'Copy URL to clipboard', 'activitypub' ); ?>" |
| 98 | - class="wp-element-button" | |
| 96 | + class="wp-element-button wp-block-button__link" | |
| 99 | 97 | data-wp-on--click="actions.copyToClipboard" |
| 100 | 98 | type="button" |
| 101 | 99 | > |
| 102 | 100 | <span data-wp-text="context.copyButtonText"></span> |
| @@ -106,9 +104,8 @@ | ||
| 106 | 104 | <div class="activitypub-dialog__section"> |
| 107 | 105 | <h4><?php esc_html_e( 'Your Profile', 'activitypub' ); ?></h4> |
| 108 | 106 | <div class="activitypub-dialog__description"> |
| 109 | 107 | <?php esc_html_e( 'Or, if you know your own profile, we can start things that way!', 'activitypub' ); ?> |
| 110 | - <?php Blocks::render_modal_help(); ?> | |
| 111 | 108 | </div> |
| 112 | 109 | <div class="activitypub-dialog__button-group"> |
| 113 | 110 | <label for="<?php echo esc_attr( $block_id . '-remote-profile' ); ?>" class="screen-reader-text"> |
| 114 | 111 | <?php esc_html_e( 'Your Fediverse profile', 'activitypub' ); ?> |
| @@ -113,10 +110,8 @@ | ||
| 113 | 110 | <label for="<?php echo esc_attr( $block_id . '-remote-profile' ); ?>" class="screen-reader-text"> |
| 114 | 111 | <?php esc_html_e( 'Your Fediverse profile', 'activitypub' ); ?> |
| 115 | 112 | </label> |
| 116 | 113 | <input |
| 117 | - aria-describedby="<?php echo esc_attr( $error_id ); ?>" | |
| 118 | - class="wp-block-search__input" | |
| 119 | 114 | data-wp-bind--aria-invalid="context.isError" |
| 120 | 115 | data-wp-bind--value="context.remoteProfile" |
| 121 | 116 | data-wp-on--input="actions.updateRemoteProfile" |
| 122 | 117 | data-wp-on--keydown="actions.onInputKeydown" |
| @@ -125,9 +120,9 @@ | ||
| 125 | 120 | type="text" |
| 126 | 121 | /> |
| 127 | 122 | <button |
| 128 | 123 | aria-label="<?php esc_attr_e( 'Reply', 'activitypub' ); ?>" |
| 129 | - class="wp-element-button" | |
| 124 | + class="wp-element-button wp-block-button__link" | |
| 130 | 125 | data-wp-bind--disabled="context.isLoading" |
| 131 | 126 | data-wp-on--click="actions.submitRemoteProfile" |
| 132 | 127 | type="button" |
| 133 | 128 | > |
| @@ -136,11 +131,10 @@ | ||
| 136 | 131 | </button> |
| 137 | 132 | </div> |
| 138 | 133 | <div |
| 139 | 134 | class="activitypub-dialog__error" |
| 135 | + data-wp-bind--hidden="!context.isError" | |
| 140 | 136 | data-wp-text="context.errorMessage" |
| 141 | - id="<?php echo esc_attr( $error_id ); ?>" | |
| 142 | - role="alert" | |
| 143 | 137 | ></div> |
| 144 | 138 | <div class="activitypub-dialog__remember"> |
| 145 | 139 | <label> |
| 146 | 140 | <input |
| @@ -178,9 +172,9 @@ | ||
| 178 | 172 | </a> |
| 179 | 173 | |
| 180 | 174 | <button |
| 181 | 175 | type="button" |
| 182 | - class="activitypub-remote-profile__close wp-element-button" | |
| 176 | + class="activitypub-remote-profile__close wp-element-button wp-block-button__link" | |
| 183 | 177 | data-wp-on--click="actions.deleteRemoteUser" |
| 184 | 178 | title="<?php esc_attr_e( 'Delete Remote Profile', 'activitypub' ); ?>" |
| 185 | 179 | > |
| 186 | 180 | <svg fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" width="18" height="18" role="img" aria-hidden="true" focusable="false"> |
| @@ -190,10 +184,10 @@ | ||
| 190 | 184 | </div> |
| 191 | 185 | |
| 192 | 186 | <a |
| 193 | 187 | class="comment-reply-link activitypub-remote-reply__link" |
| 194 | - data-wp-on--click="actions.toggleModal" | |
| 195 | - data-wp-on--keydown="actions.onReplyLinkKeydown" | |
| 188 | + data-wp-on-async--click="actions.toggleModal" | |
| 189 | + data-wp-on-async--keydown="actions.onReplyLinkKeydown" | |
| 196 | 190 | data-wp-bind--hidden="state.hasRemoteUser" |
| 197 | 191 | data-wp-bind--aria-expanded="context.modal.isOpen" |
| 198 | 192 | aria-label="<?php esc_attr_e( 'Reply on the Fediverse', 'activitypub' ); ?>" |
| 199 | 193 | aria-haspopup="dialog" |