Merge pull request #87 from localgovdrupal/1.x

1.0.0-alpha2 release

.github/workflows/test.yml

@@ -24,13 +24,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'      
 
     steps:
 
@@ -108,13 +108,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
@@ -144,13 +144,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
@@ -179,13 +179,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 

README.md

@@ -26,6 +26,27 @@ composer require localgovdrupal/localgov_publications:^1.0.0-alpha1
 
 Please do install and test with real publication content and report any issues to Github at https://github.com/localgovdrupal/localgov_publications/issues
 
+## Testing on Gitpod
+
+You should be able to spin up a Gitpod install of LocalGov Drupal by:
+
+1. [Create an account on gitpod.io](https://gitpod.io/login), if you haven't already.
+2. Follow this link to [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/localgovdrupal/localgov_project) 
+
+Once Gitpod is fired up, you should have a command line in VSCode where you can execute commands to download and enable Localgov Pulications.
+
+```
+ddev composer require localgovdrupal/localgov_publications:^1.0.0-alpha1
+ddev drush en localgov_publications
+```
+Then you might want to use drush to generate a one time login link with
+
+```
+ddev drush uli
+```
+
+Control click the link to open in a new tab and you can start to test creating publication content. 
+
 ## Maintainers 
 
 This project is currently maintained by: 

config/install/filter.format.publications.yml

@@ -112,3 +112,4 @@ filters:
     settings:
       footnotes_collapse: '1'
       footnotes_html: '1'
+      footnotes_css: '1'

config/install/views.view.publications.yml

@@ -87,7 +87,7 @@ display:
             alter_text: false
             text: 'Edit order and titles'
             make_link: false
-            path: 'admin/structure/book/  {{ nid__value }}'
+            path: 'admin/structure/publications/{{ nid__value }}'
             absolute: false
             external: false
             replace_spaces: false
@@ -151,7 +151,7 @@ display:
             alter_text: true
             text: 'Edit order and titles'
             make_link: true
-            path: 'admin/structure/book/{{ nid }}'
+            path: 'admin/structure/publications/{{ nid }}'
             absolute: false
             external: false
             replace_spaces: false

css/localgov-publications.css

@@ -7,3 +7,10 @@
 .book-navigation--publication .next-link {
   margin-left: auto;
 }
+
+/* Leaving this in the module until it passes Alpha. */
+.lgd-page-title-block__publication-title {
+  font-size: var(--page-title-lede-font-size);
+  color: var(--color-grey-dark);
+  display: block;
+}

localgov_publications.module

@@ -5,13 +5,13 @@
  * Module file for the LocalGov Publications module.
  */
 
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Form\FormStateInterface;
+use Drupal\block\Entity\Block;
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
-use Drupal\block\Entity\Block;
 use Drupal\user\Entity\Role;
-use Drupal\Core\Url;
 
 /**
  * Implements hook_theme().
@@ -28,7 +28,8 @@ function localgov_publications_theme($existing, $type, $theme, $path) {
     ],
     'localgov_publication_page_header_block' => [
       'variables' => [
-        'title' => NULL,
+        'title' => '',
+        'node_title' => '',
         'published_date' => NULL,
         'last_updated_date' => NULL,
       ],
@@ -37,7 +38,7 @@ function localgov_publications_theme($existing, $type, $theme, $path) {
 }
 
 /**
- * Implements hook_install().
+ * Implements hook_modules_installed().
  */
 function localgov_publications_modules_installed($modules, $is_syncing) {
   if (!$is_syncing && in_array('localgov_publications', $modules)) {
@@ -64,8 +65,7 @@ function localgov_publications_theme_suggestions_book_navigation(array $variable
   // Only add suggestion on publication pages and publication landing pages.
   $node = \Drupal::routeMatch()->getParameter('node');
   if (localgov_publications_is_publication_type($node->getType())) {
-    $original = $variables['theme_hook_original'] . '__';
-    $suggestions[] = $original . 'publication';
+    $suggestions[] = $variables['theme_hook_original'] . '__' . 'publication';
   }
 
   return $suggestions;
@@ -83,6 +83,18 @@ function localgov_publications_block_access(Block $block, $operation, AccountInt
   }
 }
 
+/**
+ * Implements hook_form_FORM_ID_alter() for book_admin_edit.
+ */
+function localgov_publications_form_book_admin_edit_alter(&$form, FormStateInterface $form_state, $form_id) {
+
+  // If we're on the route this module uses for this form, change some wording.
+  $route_name = \Drupal::routeMatch()->getRouteName();
+  if ($route_name === 'publication.admin_edit') {
+    $form['save']['#value'] = t('Save publication pages');
+  }
+}
+
 /**
  * Implements hook_form_alter().
  */
@@ -116,38 +128,26 @@ function localgov_publications_form_alter(&$form, FormStateInterface $form_state
   // Alter the select element.
   $form['book']['bid']['#title'] = t('Publication');
 
-  // Change the "Create new book".
-  if (!empty($form['book']['bid']['#options'][$node->id()])) {
-    $form['book']['bid']['#options'][$node->id()] = t(
-      '- Create a new publication -',
-    );
-  }
-  elseif (!empty($form['book']['bid']['#options']['new'])) {
-    $form['book']['bid']['#options']['new'] = t(
-      '- Create a new publication -',
-    );
+  // Change "Create new book" to "Create a new publication".
+  if (!empty($form['book']['bid']['#options']['new'])) {
+    $form['book']['bid']['#options']['new'] = t('- Create a new publication -');
   }
 
-  $form['book']['bid']['#description'] = t(
-    'Your page will be part of the selected publication',
-  );
+  $form['book']['bid']['#description'] = t('Your page will be part of the selected publication');
 
   // Alter "No book selected".
   if (empty($book_values)) {
-    $form['book']['pid']['#prefix'] =
-      '<div id="edit-book-plid-wrapper"><em>No publication selected.</em>';
+    $form['book']['pid']['#prefix'] = '<div id="edit-book-plid-wrapper"><em>No publication selected.</em>';
   }
   else {
     switch ($book_values['bid']) {
       case '0':
-        $form['book']['pid']['#prefix'] =
-          '<div id="edit-book-plid-wrapper"><em>No publication selected.</em>';
+        $form['book']['pid']['#prefix'] = '<div id="edit-book-plid-wrapper"><em>No publication selected.</em>';
         break;
 
       case 'new':
       case $node->id():
-        $form['book']['pid']['#prefix'] =
-          '<div id="edit-book-plid-wrapper"><em>This will be the top-level page in this publication.</em>';
+        $form['book']['pid']['#prefix'] = '<div id="edit-book-plid-wrapper"><em>This will be the top-level page in this publication.</em>';
         break;
 
       default:

localgov_publications.routing.yml

@@ -0,0 +1,9 @@
+publication.admin_edit:
+  path: '/admin/structure/publications/{node}'
+  defaults:
+    _form: '\Drupal\book\Form\BookAdminEditForm'
+    _title: 'Re-order publication pages and change titles'
+  requirements:
+    _permission: 'administer book outlines'
+    _entity_access: 'node.view'
+    node: \d+

localgov_publications.services.yml

@@ -5,3 +5,6 @@ services:
       - { name: event_subscriber }
   localgov_publications.heading_finder:
     class: Drupal\localgov_publications\Service\HeadingFinder
+  localgov_publications.publication_manager:
+    class: Drupal\localgov_publications\Service\PublicationManager
+    arguments: ['@entity_type.manager']

localgov_publications.tokens.inc

@@ -29,6 +29,7 @@ function localgov_publications_tokens_alter(array &$replacements, array $context
     }
     $query = \Drupal::entityQuery('node');
     $query->condition('localgov_publication', $bid);
+    $query->accessCheck(FALSE);
     $result = $query->execute();
     if (!empty($result)) {
       $landingPageNid = reset($result);

src/EventSubscriber/LocalgovPublicationsRouteSubscriber.php

@@ -23,7 +23,7 @@ protected function alterRoutes(RouteCollection $collection) {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
     $events = parent::getSubscribedEvents();
 
     // Use a lower priority than \Drupal\views\EventSubscriber\RouteSubscriber