Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
529 changes: 269 additions & 260 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"watch": "webpack --watch --mode development"
},
"dependencies": {
"@siteimprove/accessibility-cms-components": "github:siteimprove/cms-alfa-fe-app#development",
"@siteimprove/accessibility-cms-components": "^0.2.2",
"@siteimprove/alfa-act": "^0.101.0",
"@siteimprove/alfa-jquery": "^0.78",
"@siteimprove/alfa-json": "^0.101.0",
Expand Down
3 changes: 3 additions & 0 deletions siteimprove-accessibility/assets/gutenberg.entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ import { SinglePageReporting } from '@siteimprove/accessibility-cms-components';
<Button
className="siteimprove-scan-button"
onClick={() => setModalOpen(true)}
data-observe-key="a11y-WordPress-EditorModalOpenButton"
>
<span>
{__('Check page', 'siteimprove-accessibility')}
Expand Down Expand Up @@ -122,13 +123,15 @@ import { SinglePageReporting } from '@siteimprove/accessibility-cms-components';
isSecondary
onClick={handleActionCancel}
style={{ margin: '5px' }}
data-observe-key="a11y-WordPress-EditorModalCancelButton"
>
{__('Cancel', 'siteimprove-accessibility')}
</Button>
<Button
isPrimary
onClick={handleActionConfirm}
style={{ margin: '5px' }}
data-observe-key="a11y-WordPress-EditorModalConfirmButton"
>
{__('Confirm', 'siteimprove-accessibility')}
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
}

.siteimprove-empty-issues-container {
padding: 100px 0;
padding: 50px 0;
text-align: center;
}

Expand Down
5 changes: 5 additions & 0 deletions siteimprove-accessibility/src/Admin/Gutenberg_Sidebar.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
namespace Siteimprove\Accessibility\Admin;

use Siteimprove\Accessibility\Core\Hook_Interface;
use Siteimprove\Accessibility\Core\Usage_Tracking_Trait;
use Siteimprove\Accessibility\Siteimprove_Accessibility;

class Gutenberg_Sidebar implements Hook_Interface {

use Usage_Tracking_Trait;

/**
* @return void
*/
Expand All @@ -31,6 +34,8 @@ public function enqueue_scripts(): void {
SITEIMPROVE_ACCESSIBILITY_VERSION,
false
);

$this->enqueue_usage_tracking_scripts();
}

/**
Expand Down
4 changes: 4 additions & 0 deletions siteimprove-accessibility/src/Admin/Scan_Panel.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
namespace Siteimprove\Accessibility\Admin;

use Siteimprove\Accessibility\Core\Hook_Interface;
use Siteimprove\Accessibility\Core\Usage_Tracking_Trait;
use Siteimprove\Accessibility\Core\View_Trait;
use Siteimprove\Accessibility\Siteimprove_Accessibility;

class Scan_Panel implements Hook_Interface {

use View_Trait;
use Usage_Tracking_Trait;

/**
* @return void
Expand Down Expand Up @@ -50,6 +52,8 @@ public function enqueue_scripts(): void {
'auto_check' => $this->isAutoCheckEnabled(),
)
);

$this->enqueue_usage_tracking_scripts();
}

/**
Expand Down
11 changes: 10 additions & 1 deletion siteimprove-accessibility/src/Admin/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
namespace Siteimprove\Accessibility\Admin;

use Siteimprove\Accessibility\Core\Hook_Interface;
use Siteimprove\Accessibility\Core\Usage_Tracking_Trait;
use Siteimprove\Accessibility\Core\View_Trait;
use Siteimprove\Accessibility\Siteimprove_Accessibility;
use Siteimprove\Alfa\Stim_Alfa;

class Settings implements Hook_Interface {

use View_Trait;
use Usage_Tracking_Trait;

const MENU_SLUG = 'siteimprove_accessibility_settings';

Expand Down Expand Up @@ -40,6 +41,7 @@ public function init_options(): void {
public function register_hooks(): void {
add_filter( 'plugin_action_links_siteimprove-accessibility/siteimprove-accessibility.php', array( $this, 'action_links' ) );
add_action( 'admin_init', array( $this, 'register_settings' ) );
add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
}

/**
Expand All @@ -59,6 +61,13 @@ public function action_links( array $links ): array {
return $links;
}

/**
* @return void
*/
public function enqueue_scripts(): void {
$this->enqueue_usage_tracking_scripts();
}

/**
* @return void
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<fieldset>
<label>
<input type="checkbox" name="<?php echo esc_attr( Siteimprove_Accessibility::OPTION_IS_USAGE_TRACKING_ENABLED ); ?>" <?php echo checked( get_option( Siteimprove_Accessibility::OPTION_IS_USAGE_TRACKING_ENABLED, 1 ) ); ?>>
<input type="checkbox" name="<?php echo esc_attr( Siteimprove_Accessibility::OPTION_IS_USAGE_TRACKING_ENABLED ); ?>" data-observe-key="a11y-WordPress-UsageTrackingCheckbox" <?php echo checked( get_option( Siteimprove_Accessibility::OPTION_IS_USAGE_TRACKING_ENABLED, 1 ) ); ?>>
<?php esc_html_e( 'Enable anonymous usage data collection.', 'siteimprove_accessibility' ); ?>
</label>
</fieldset>
2 changes: 1 addition & 1 deletion siteimprove-accessibility/views/scan_panel.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</div>
<div class="scan-panel-body">
<div class="scan-panel-control">
<button class="siteimprove-scan-button"><span><?php esc_html_e( 'Check page', 'siteimprove-accessibility' ); ?></span></button>
<button class="siteimprove-scan-button" data-observe-key="a11y-WordPress-ScanButton"><span><?php esc_html_e( 'Check page', 'siteimprove-accessibility' ); ?></span></button>
</div>
<div id="siteimprove-scan-results"></div>
</div>
Expand Down
13 changes: 8 additions & 5 deletions siteimprove-accessibility/views/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
<?php settings_errors(); ?>

<div class="siteimprove-extension-notification">
<div class="text-content">
<h2><?php esc_html_e( 'Instant Accessibility Checks, In Your Browser.', 'siteimprove-accessibility' ); ?></h2>
<p><?php esc_html_e( 'Securely test webpages, multi-step forms and dynamic content for accessibility with our free extension. Highlight issues and understand their impact on users, all within your browser.', 'siteimprove-accessibility' ); ?></p>
</div>
<div class="text-content">
<h2><?php esc_html_e( 'Instant Accessibility Checks, In Your Browser.', 'siteimprove-accessibility' ); ?></h2>
<p><?php esc_html_e( 'Securely test webpages, multi-step forms and dynamic content for accessibility with our free extension. Highlight issues and understand their impact on users, all within your browser.', 'siteimprove-accessibility' ); ?></p>
</div>
<a href="https://www.siteimprove.com/integrations/browser-extensions/" class="button button-primary" target="_blank">Get the extension ↗</a>
</div>
</div>
Expand All @@ -29,7 +29,10 @@
<?php
settings_fields( 'siteimprove_accessibility_settings' );
do_settings_sections( 'siteimprove_accessibility_settings' );
submit_button( __( 'Update settings', 'siteimprove-accessibility' ) );
?>
<p class="submit">
<?php submit_button( __( 'Update settings', 'siteimprove-accessibility' ), 'primary', 'submit', false ); ?>
<span style="display: block; margin-top: 10px;"><a href="https://frontier.siteimprove.com/page/terms-and-conditions" target="_blank"><?php esc_html_e( 'Terms and Conditions', 'siteimprove-accessibility' ); ?></a></span>
</p>
</form>
</div>