' . t('Revisions allow you to track differences between multiple versions of your content, and revert to older versions.') . '
'; case 'diff.fields_list': - return '' . t('This table provides a summary of the field support found on the system. For every field a diff plugin can be selected and configured. This settings are applied to Unified and Split fields layouts.') . '
'; + return '' . t('This table provides a summary of the field support found on the system. For every field, a diff plugin can be selected and configured. These settings are applied to Unified and Split fields layouts.') . '
'; } } diff --git a/src/Form/GeneralSettingsForm.php b/src/Form/GeneralSettingsForm.php index b91e51b..0aadbd1 100644 --- a/src/Form/GeneralSettingsForm.php +++ b/src/Form/GeneralSettingsForm.php @@ -82,7 +82,6 @@ class GeneralSettingsForm extends ConfigFormBase { $weight++; } - $form['layout_plugins'] = [ '#type' => 'table', '#header' => [t('Layout'), t('Description'), t('Weight')], @@ -143,15 +142,15 @@ class GeneralSettingsForm extends ConfigFormBase { $options = array_combine($context_lines, $context_lines); $form['field_based_settings']['context_lines_leading'] = array( '#type' => 'select', - '#title' => $this->t('Leading context lines'), - '#description' => $this->t('This governs the number of unchanged leading context "lines" to preserve.'), + '#title' => $this->t('Leading'), + '#description' => $this->t('This governs the number of unchanged leading context "lines" to preserve.'), '#default_value' => $config->get('general_settings' . '.' . 'context_lines_leading'), '#options' => $options, ); $form['field_based_settings']['context_lines_trailing'] = array( '#type' => 'select', - '#title' => $this->t('Trailing context lines'), - '#description' => $this->t('This governs the number of unchanged trailing context "lines" to preserve.'), + '#title' => $this->t('Trailing'), + '#description' => $this->t('This governs the number of unchanged trailing context "lines" to preserve.'), '#default_value' => $config->get('general_settings' . '.' . 'context_lines_trailing'), '#options' => $options, ); @@ -160,7 +159,7 @@ class GeneralSettingsForm extends ConfigFormBase { if ($this->diffLayoutManager->hasDefinition('visual_inline')) { $form['visual_inline_settings'] = [ '#type' => 'details', - '#title' => $this->t('Visual inline layout settings'), + '#title' => $this->t('Visual layout settings'), '#open' => TRUE, '#states' => [ 'visible' => [ @@ -169,14 +168,20 @@ class GeneralSettingsForm extends ConfigFormBase { ], ]; + // Get the theme data to display the related theme name. + $default_theme_name = $this->config('system.theme')->get('default'); + $admin_theme_name = $this->config('system.theme')->get('admin'); $form['visual_inline_settings']['visual_inline_theme'] = [ '#type' => 'select', '#title' => $this->t('Theme'), '#options' => [ - 'standard' => $this->t('Standard'), + 'default' => $this->t('Default'), 'admin' => $this->t('Admin'), ], - '#description' => $this->t('Theme used for Visual inline layout when comparing revisions.'), + '#description' => $this->t('Use Default to display the comparison as %default theme, or Admin as %admin theme.', [ + '%default' => $default_theme_name, + '%admin' => $admin_theme_name, + ]), '#default_value' => $config->get('general_settings')['visual_inline_theme'], ]; } diff --git a/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php b/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php index 291331b..d020e5e 100644 --- a/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php +++ b/src/Plugin/diff/Layout/SplitFieldsDiffLayout.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\RequestStack; * @DiffLayoutBuilder( * id = "split_fields", * label = @Translation("Split fields"), - * description = @Translation("Field based layout, revision comparison is made side by side."), + * description = @Translation("Field based layout, displays revision comparison side by side."), * ) */ class SplitFieldsDiffLayout extends DiffLayoutBase { diff --git a/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php b/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php index 302c395..0521b5a 100644 --- a/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php +++ b/src/Plugin/diff/Layout/UnifiedFieldsDiffLayout.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\RequestStack; * @DiffLayoutBuilder( * id = "unified_fields", * label = @Translation("Unified fields"), - * description = @Translation("Field based layout, revision comparison is made line by line."), + * description = @Translation("Field based layout, displays revision comparison line by line."), * ) */ class UnifiedFieldsDiffLayout extends DiffLayoutBase { diff --git a/src/Plugin/diff/Layout/VisualInlineDiffLayout.php b/src/Plugin/diff/Layout/VisualInlineDiffLayout.php index a32d7ac..3071544 100644 --- a/src/Plugin/diff/Layout/VisualInlineDiffLayout.php +++ b/src/Plugin/diff/Layout/VisualInlineDiffLayout.php @@ -25,7 +25,7 @@ use Symfony\Component\HttpFoundation\RequestStack; * @DiffLayoutBuilder( * id = "visual_inline", * label = @Translation("Visual Inline"), - * description = @Translation("Visual layout, revision comparison is made as the content is rendered for the user."), + * description = @Translation("Visual layout, displays revision comparison using the entity type view mode."), * ) */ class VisualInlineDiffLayout extends DiffLayoutBase { diff --git a/src/Tests/AdminFormsTest.php b/src/Tests/AdminFormsTest.php index 9834aad..f17c07a 100644 --- a/src/Tests/AdminFormsTest.php +++ b/src/Tests/AdminFormsTest.php @@ -52,8 +52,8 @@ class AdminFormsTest extends DiffTestBase { // Check the settings introduction text. $this->assertText('Configurations for the revision comparison functionality and diff layout plugins.'); // Check the layout plugins descriptions. - $this->assertText('Field based layout, revision comparison is made side by side.'); - $this->assertText('Field based layout, revision comparison is made line by line.'); + $this->assertText('Field based layout, displays revision comparison side by side.'); + $this->assertText('Field based layout, displays revision comparison line by line.'); } /** diff --git a/src/VisualDiffThemeNegotiator.php b/src/VisualDiffThemeNegotiator.php index 54216c8..7fa4534 100644 --- a/src/VisualDiffThemeNegotiator.php +++ b/src/VisualDiffThemeNegotiator.php @@ -18,7 +18,7 @@ class VisualDiffThemeNegotiator extends AdminNegotiator { public function applies(RouteMatchInterface $routeMatch) { if ($routeMatch->getParameter('filter') === 'visual_inline') { if ($this->isDiffRoute($routeMatch)) { - if ($this->configFactory->get('diff.settings')->get('general_settings.visual_inline_theme') === 'standard') { + if ($this->configFactory->get('diff.settings')->get('general_settings.visual_inline_theme') === 'default') { return TRUE; } } diff --git a/tests/src/Unit/VisualDiffThemeNegotiatorTest.php b/tests/src/Unit/VisualDiffThemeNegotiatorTest.php index 600768d..87d4da0 100644 --- a/tests/src/Unit/VisualDiffThemeNegotiatorTest.php +++ b/tests/src/Unit/VisualDiffThemeNegotiatorTest.php @@ -85,7 +85,7 @@ class VisualDiffThemeNegotiatorTest extends UnitTestCase { $diff_config = $this->prophesize(ImmutableConfig::class); $this->configFactory->get('diff.settings') ->willReturn($diff_config->reveal()); - $diff_config->get('general_settings.visual_inline_theme')->willReturn('standard'); + $diff_config->get('general_settings.visual_inline_theme')->willReturn('default'); \Drupal::setContainer($container->reveal()); // Check if applies function returns true.