diff --git a/css/moderation_sidebar.css b/css/moderation_sidebar.css
old mode 100644
new mode 100755
index c9d4483..4c155df
--- a/css/moderation_sidebar.css
+++ b/css/moderation_sidebar.css
@@ -1,15 +1,12 @@
.toolbar-bar .toolbar-icon-moderation-sidebar:before {
background-image: url(../images/icon.svg);
}
-
.toolbar-icon-moderation-sidebar.sidebar-open {
background-image: linear-gradient(rgba(255, 255, 255, 0.25) 20%, transparent 200%);
}
-
.toolbar .toolbar-bar .toolbar-tab.moderation-sidebar-toolbar-tab {
float: right;
}
-
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-link,
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-link:visited,
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-link.button {
@@ -24,7 +21,6 @@
text-align: center;
transition: .2s;
}
-
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-button-wrapper i.material-icons {
position: absolute;
top: 5px;
@@ -46,84 +42,66 @@
-webkit-font-feature-settings: 'liga';
-webkit-font-smoothing: antialiased;
}
-
.ui-dialog.ui-dialog-off-canvas {
border: none !important;
}
-
.ui-dialog-off-canvas #drupal-off-canvas a.moderation-sidebar-link.button {
background: #7b7b7b;
}
-
.ui-dialog-off-canvas #drupal-off-canvas a.moderation-sidebar-link.button:hover {
background: #888;
}
-
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-link:hover {
color: white;
}
-
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-link.button.button--danger {
background: #bd2727;
}
-
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-link.button.button--danger:hover,
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-link.button.button--danger:focus {
background: #da2e2e;
}
-
.quick-moderation-form select {
width: 100%;
height: 30px;
}
-
.moderation-sidebar-container {
padding-bottom: 100px;
}
-
.moderation-sidebar-info {
margin: 10px 0 20px 0;
}
-
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-container p,
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-container a {
font-size: 14px;
}
-
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-container .moderation-sidebar-back-button {
display: block;
font-size: 16px;
margin-top: 1rem;
}
-
.ui-dialog-off-canvas #drupal-off-canvas .moderation-sidebar-info h2 {
font-size: 16px;
}
-
.moderation-sidebar-revision-item:nth-child(2) {
border-top: 1px solid #676767;
margin-top: 1rem;
}
-
.moderation-sidebar-revision-item {
border-bottom: 1px solid #676767;
margin-bottom: 1rem;
}
-
.moderation-sidebar-revision-item:nth-last-child(2) {
border-bottom: none;
}
-
.moderation-sidebar-revision-item .revision-info,
.moderation-sidebar-revision-item .revision-info a {
font-size: 13px;
}
-
.toolbar a.toolbar-icon-moderation-sidebar {
padding-right: 0 !important;
overflow: hidden;
}
-
.toolbar-icon-moderation-sidebar:after {
content: attr(data-label);
margin-left: .5em;
@@ -134,27 +112,21 @@
background: #444643;
color: white;
}
-
.toolbar-icon-moderation-sidebar.moderation-label-published:after {
background: #269e2c;
}
-
.toolbar-icon-moderation-sidebar.moderation-label-draft:after {
background: #bd2727;
}
-
.toolbar-icon-moderation-sidebar.moderation-label-draft-available:after {
background: #ffae00;
}
-
.moderation-sidebar-toolbar-tab .ajax-progress {
display: none;
}
-
.toolbar-icon-moderation-sidebar + .ajax-progress {
opacity: .5;
}
-
@media only screen and (min-width: 16.5em) and (max-width: 36em) {
.toolbar-icon-moderation-sidebar:before {
filter: brightness(1.5);
diff --git a/js/moderation_sidebar.js b/js/moderation_sidebar.js
old mode 100644
new mode 100755
index 5e92f66..0cf9606
--- a/js/moderation_sidebar.js
+++ b/js/moderation_sidebar.js
@@ -12,41 +12,44 @@
// that's outdated.
$('body').once('moderation-sidebar-init').each(function () {
if (Drupal.quickedit.collections.entities) {
- Drupal.quickedit.collections.entities.on('change:isCommitting', function (model) {
- if (model.get('isCommitting') === true && $('.moderation-sidebar-container').length) {
- $('.toolbar-icon-moderation-sidebar').trigger('click', {reload: true});
- }
- });
+ Drupal.quickedit.collections.entities.on('change:isCommitting',
+ function (model) {
+ if (model.get('isCommitting') === true &&
+ $('.moderation-sidebar-container').length) {
+ $('.toolbar-icon-moderation-sidebar').
+ trigger('click', {reload: true})
+ }
+ })
}
- });
- }
- };
+ })
+ },
+ }
// Close the sidebar if the toolbar icon is clicked and moderation
// information is already available.
$('.toolbar-icon-moderation-sidebar').on('click', function (e, data) {
- $('.toolbar-item.is-active').click();
+ $('.toolbar-item.is-active').click()
if ($('.moderation-sidebar-container').length && (!data || !data.reload)) {
- $('#drupal-off-canvas').dialog('close');
- e.stopImmediatePropagation();
- e.preventDefault();
+ $('#drupal-off-canvas').dialog('close')
+ e.stopImmediatePropagation()
+ e.preventDefault()
}
- });
+ })
$(document).ready(function () {
$(window).on({
'dialog:beforecreate': function (event, dialog, $element, settings) {
if ($element.find('.moderation-sidebar-container').length) {
- $('.toolbar-icon-moderation-sidebar').addClass('sidebar-open');
- settings.dialogClass += ' ui-dialog-off-canvas';
+ $('.toolbar-icon-moderation-sidebar').addClass('sidebar-open')
+ settings.dialogClass += ' ui-dialog-off-canvas'
}
},
'dialog:beforeclose': function (event, dialog, $element) {
if ($element.find('.moderation-sidebar-container').length) {
- $('.toolbar-icon-moderation-sidebar').removeClass('sidebar-open');
+ $('.toolbar-icon-moderation-sidebar').removeClass('sidebar-open')
}
- }
- });
- });
+ },
+ })
+ })
-})(jQuery, Drupal);
+})(jQuery, Drupal)
diff --git a/moderation_sidebar.api.php b/moderation_sidebar.api.php
old mode 100644
new mode 100755
index 498865c..59e6140
--- a/moderation_sidebar.api.php
+++ b/moderation_sidebar.api.php
@@ -11,7 +11,8 @@
*/
/**
- * Alter the information provided by \Drupal\moderation_sidebar\Controller\ModerationSidebarController::sideBar()
+ * Alter the information provided by
+ * \Drupal\moderation_sidebar\Controller\ModerationSidebarController::sideBar()
*
* @param array $build
* The render array for the sidebar.
diff --git a/src/Controller/ModerationSidebarController.php b/src/Controller/ModerationSidebarController.php
old mode 100644
new mode 100755
index 05138ef..063a1f0
--- a/src/Controller/ModerationSidebarController.php
+++ b/src/Controller/ModerationSidebarController.php
@@ -101,7 +101,8 @@ class ModerationSidebarController extends ControllerBase {
$entity = $attributes->has('node') ? $attributes->get('node') : $attributes->get('entity');
$fake_request_stack = new RequestStack();
$current_request = $container->get('request_stack')->getCurrentRequest();
- $request = Request::create($entity->toUrl()->toString(), 'GET', [], [], [], $current_request->server->all(), NULL);
+ $request = Request::create($entity->toUrl()
+ ->toString(), 'GET', [], [], [], $current_request->server->all(), NULL);
/** @var \Drupal\Core\Routing\AccessAwareRouter $router */
$router = $container->get('router');
@@ -241,7 +242,8 @@ class ModerationSidebarController extends ControllerBase {
}
// We maintain our own inline revisions tab.
- if ($entity_type_id === 'node' && \Drupal::service('access_check.node.revision')->checkAccess($entity, \Drupal::currentUser()->getAccount())) {
+ if ($entity_type_id === 'node' && \Drupal::service('access_check.node.revision')
+ ->checkAccess($entity, \Drupal::currentUser()->getAccount())) {
$build['actions']['version_history'] = [
'#title' => $this->t('Show revisions'),
'#type' => 'link',
@@ -257,7 +259,9 @@ class ModerationSidebarController extends ControllerBase {
}
// We maintain our own inline translate tab.
- if ($this->moduleHandler()->moduleExists('content_translation') && \Drupal::service('content_translation.manager')->isSupported($entity_type_id)) {
+ if ($this->moduleHandler()
+ ->moduleExists('content_translation') && \Drupal::service('content_translation.manager')
+ ->isSupported($entity_type_id)) {
$build['actions']['translate'] = [
'#title' => $this->t('Translate'),
'#type' => 'link',
@@ -275,7 +279,8 @@ class ModerationSidebarController extends ControllerBase {
// Provide a list of actions representing transitions for this revision.
if ($is_latest) {
- $build['actions']['quick_draft_form'] = $this->formBuilder()->getForm(QuickTransitionForm::class, $entity);
+ $build['actions']['quick_draft_form'] = $this->formBuilder()
+ ->getForm(QuickTransitionForm::class, $entity);
$build['actions']['quick_draft_form']['#weight'] = 2;
}
}
@@ -346,14 +351,18 @@ class ModerationSidebarController extends ControllerBase {
$revision = $node_storage->loadRevision($vid);
// Only show revisions that are affected by the language that is being
// displayed.
- if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
+ if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)
+ ->isRevisionTranslationAffected()) {
$user = $revision->getRevisionUser();
$message = !empty($revision->revision_log->value) ? $revision->revision_log->value : $this->t('No message');
// Use revision link to link to revisions that are not active.
$time = $revision->revision_timestamp->value;
$pretty_time = $this->getPrettyTime($revision->revision_timestamp->value);
if ($vid != $node->getRevisionId()) {
- $link = new Link($pretty_time, new Url('entity.node.revision', ['node' => $node->id(), 'node_revision' => $vid]));
+ $link = new Link($pretty_time, new Url('entity.node.revision', [
+ 'node' => $node->id(),
+ 'node_revision' => $vid,
+ ]));
}
else {
$link = $node->toLink($pretty_time);
@@ -361,7 +370,10 @@ class ModerationSidebarController extends ControllerBase {
$build[] = [
'#theme' => 'moderation_sidebar_revision',
- '#revision_message' => ['#markup' => $message, '#allowed_tags' => Xss::getHtmlTagList()],
+ '#revision_message' => [
+ '#markup' => $message,
+ '#allowed_tags' => Xss::getHtmlTagList(),
+ ],
'#revision_time' => $time,
'#revision_time_pretty' => $pretty_time,
'#revision_author' => $user->getDisplayName(),
@@ -401,7 +413,9 @@ class ModerationSidebarController extends ControllerBase {
$bundle = $entity->bundle();
$account = $this->currentUser();
- if (!\Drupal::moduleHandler()->moduleExists('content_translation') || !\Drupal::service('content_translation.manager')->isSupported($entity_type_id)) {
+ if (!\Drupal::moduleHandler()
+ ->moduleExists('content_translation') || !\Drupal::service('content_translation.manager')
+ ->isSupported($entity_type_id)) {
throw new AccessDeniedHttpException();
}
diff --git a/src/Form/QuickTransitionForm.php b/src/Form/QuickTransitionForm.php
old mode 100644
new mode 100755
index 8ec365e..8fdd0f5
--- a/src/Form/QuickTransitionForm.php
+++ b/src/Form/QuickTransitionForm.php
@@ -177,7 +177,8 @@ class QuickTransitionForm extends FormBase {
}
$revision = $this->prepareNewRevision($default_revision, $revision_log);
$revision->save();
- $this->messenger()->addMessage($this->t('The draft has been discarded successfully.'));
+ $this->messenger()
+ ->addMessage($this->t('The draft has been discarded successfully.'));
// There is no generic entity route to view a single revision, but we know
// that the node module support this.
@@ -186,7 +187,8 @@ class QuickTransitionForm extends FormBase {
'node' => $entity->id(),
'node_revision' => $entity->getRevisionId(),
])->toString();
- $this->messenger()->addMessage($this->t('You can view an archive of the draft by clicking here.', ['@url' => $url]));
+ $this->messenger()
+ ->addMessage($this->t('You can view an archive of the draft by clicking here.', ['@url' => $url]));
}
$form_state->setRedirectUrl($entity->toLink()->getUrl());
@@ -223,7 +225,8 @@ class QuickTransitionForm extends FormBase {
$revision->set('moderation_state', $state_id);
$revision->save();
- $this->messenger()->addMessage($this->t('The moderation state has been updated.'));
+ $this->messenger()
+ ->addMessage($this->t('The moderation state has been updated.'));
if (!$this->moderationInformation->hasPendingRevision($entity)) {
$form_state->setRedirectUrl($entity->toUrl());
diff --git a/templates/moderation-sidebar-info.html.twig b/templates/moderation-sidebar-info.html.twig
old mode 100644
new mode 100755
index d77182c..44a840c
--- a/templates/moderation-sidebar-info.html.twig
+++ b/templates/moderation-sidebar-info.html.twig
@@ -17,8 +17,9 @@
*/
#}
diff --git a/templates/moderation-sidebar-revision.html.twig b/templates/moderation-sidebar-revision.html.twig
old mode 100644
new mode 100755
index a6f6ef3..2d0f7a1
--- a/templates/moderation-sidebar-revision.html.twig
+++ b/templates/moderation-sidebar-revision.html.twig
@@ -16,8 +16,8 @@
*/
#}
diff --git a/tests/src/FunctionalJavascript/ModerationSidebarTest.php b/tests/src/FunctionalJavascript/ModerationSidebarTest.php
old mode 100644
new mode 100755
index 0406a59..b4087de
--- a/tests/src/FunctionalJavascript/ModerationSidebarTest.php
+++ b/tests/src/FunctionalJavascript/ModerationSidebarTest.php
@@ -23,9 +23,14 @@ class ModerationSidebarTest extends JavascriptTestBase {
parent::setUp();
// Create a Content Type with moderation enabled.
- $node_type = $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+ $node_type = $this->drupalCreateContentType([
+ 'type' => 'article',
+ 'name' => 'Article',
+ ]);
/* @var \Drupal\workflows\WorkflowInterface $workflow */
- $workflow = $this->container->get('entity_type.manager')->getStorage('workflow')->load('editorial');
+ $workflow = $this->container->get('entity_type.manager')
+ ->getStorage('workflow')
+ ->load('editorial');
$workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'article');
$workflow->save();
$node_type->setNewRevision(TRUE);
@@ -64,7 +69,8 @@ class ModerationSidebarTest extends JavascriptTestBase {
$this->clickLink('Tasks');
$this->assertSession()->assertWaitOnAjaxRequest();
// Archived transitions should not be visible based on our permissions.
- $this->assertSession()->elementNotExists('css', '.moderation-sidebar-link#published_archived');
+ $this->assertSession()
+ ->elementNotExists('css', '.moderation-sidebar-link#published_archived');
// Create a draft of the article.
$this->submitForm([], 'Create New Draft');
$this->assertSession()->addressEquals('node/' . $node->id() . '/latest');
@@ -84,7 +90,8 @@ class ModerationSidebarTest extends JavascriptTestBase {
$this->clickLink('Tasks');
$this->assertSession()->assertWaitOnAjaxRequest();
$this->click('#moderation-sidebar-discard-draft');
- $this->assertSession()->pageTextContains('The draft has been discarded successfully');
+ $this->assertSession()
+ ->pageTextContains('The draft has been discarded successfully');
}
}