### Problem/Motivation Testing and use of 2.0.0-beta1 have highlighted opportunities to improve image handling and simplify Puzzler for site builders and editors. Some reusable Wikimedia images were excluded because their metadata did not provide credit in the expected form. Configuring several articles or images also required numerous separate fields. This issue brings together the improvements proposed for 2.0.0-beta2. Drupal 10.3+, 11 and 12 remain the supported core versions. ### Proposed resolution * **Keep articles, images and ALT text in one field.** The new optional “Puzzler Wikipedia content” field stores an article URL or title, its image choices and each image’s alternative text together. Separate image-choice and ALT fields, and settings connecting their machine names, are no longer needed for this setup. * **Allow multiple articles and images.** With unlimited field values, “Add another article” adds a complete independent article. Each article can have multiple images. Editors can add, remove and reorder articles and images. Every image can be set to no image, the automatic representative image, or a specific Wikimedia file. * **Display each article as a group.** The combined “Images and introduction” output displays an article’s selected images followed by its introduction, then the next article’s images and introduction. A “Show introduction” checkbox, enabled by default on each article, can hide its introduction while retaining its images, for example for an article in another language. It also applies to introduction-only output. Separate options show introductions, article HTML, article links or images only. These options work in Views and normal entity displays. * **Accept Wikipedia article URLs.** Editors can paste an article URL instead of entering its title. Desktop and mobile Wikipedia URLs are recognised, including encoded characters, and the URL identifies the Wikipedia language. Existing title values remain supported. URL fragments and historical-revision parameters do not select a section or revision; Puzzler retrieves current content. * **Improve image licensing and attribution handling.** A missing “Artist” entry no longer automatically excludes an image when the file has a usable public-domain or CC0 declaration. Puzzler recognises public-domain and CC0 declarations and alternative attribution information. Where necessary, it checks and caches standard credit and licensing information from the Wikimedia Commons file page, without relying on a “Licensing” heading or treating the page footer licence as the image licence. * **Add image and caption controls.** Global settings control accepted licence categories and the information shown below images, with overrides on individual field formatters. Defaults permit public-domain, CC0, CC BY, CC BY-SA and other freely licensed Commons images. Licensed images with incomplete attribution still require an explicit opt-in. Captions use concise licence names by default. Public-domain and CC0 captions are shown by default, with an option to hide the whole caption, including its source and rights information. Full licence names are optional. Help explains when credit or licence information may need to be supplied separately. These controls do not establish legal permission for every use. * **Check and preview selected images.** Choosing a file from the article list checks that image automatically. “Check image” also checks manually entered file titles and automatic representative images. Successful checks show a preview of limited size, credit and alternative text. The file-title box stays visible and editable after a list selection. Checks use global image settings; formatter overrides may produce a different display result. * **Make image-loading controls clearer.** In the new field, “Load images from article” appears with the manual file-choice controls, above the file list. Once images are loaded, it becomes “Reload images from article”. Changing the article marks the list as needing a reload. Loading a list does not check every image. Additional-image controls retain access to already configured image rows when the first image is switched off. * **Preserve, edit and recover alternative text.** Puzzler uses ALT text from the image’s Wikipedia article where available, with fallbacks to its description and the article title. The new field includes an editable ALT box for each image; existing plain-text setups can use a companion field. Checking a different image refreshes ALT text, keeping previous custom wording available to copy or restore with “Restore this ALT text”. Rechecking the same image preserves edits. Recovery is independent for each image and lasts for the current editing session only. * **Group the editing controls.** Related article, image, preview and editable ALT controls are grouped on the form. ALT input is available without first pressing “Check image”. In existing setups without an editable ALT field, source ALT is shown directly after checking unless unusually long, when it remains collapsible. * **Explain unavailable content.** Optional messages, enabled by default, distinguish temporary API failures, including replication lag, from missing content, licensing restrictions and incomplete attribution. A failed or refused article request can show “Wikipedia introduction currently not available”. Image warnings link to the file page when known. Image-check warnings also link to global Puzzler settings for editors with permission to access them. Explicitly selected files can be retrieved even when the parent article cannot be resolved. * **Offer new-tab image attribution links.** Image credit links open in a new tab by default, with global and formatter controls to change this. This applies to image attribution, not links throughout the Wikipedia article text. * **Find images on non-English Wikipedia articles.** Recognise translated file namespaces such as German “Datei” and French “Fichier”, and offer their images using the standard “File:” prefix. The selected images work with both combined introduction-and-images output and images with credit. * **Handle Wikimedia file titles more reliably.** URL-encoded characters in file titles are decoded when checked or saved, while literal plus signs are preserved. Editor controls show underscores; both spaces and underscores remain accepted, including older saved selections. * **Clarify display configuration.** Help distinguishes formatter settings in a View from settings in an entity view mode. Separately configured Views fields retain their own settings; a View rendering an entity can use the chosen view mode’s settings. * **Modernise runtime hooks.** Adapted from the Project Update Bot work in [#2994187](https://git.drupalcode.org/project/puzzler/-/work_items/2994187), cron, token and form-alter handling uses Drupal’s object-oriented hooks with dependency injection. Compatibility wrappers remain for older supported Drupal versions. This is modernization, not a claim that procedural hooks are already incompatible with Drupal 12. Downloading images into Drupal’s local filesystem is outside this issue’s scope. Images continue to be served from Wikimedia. ### Upgrade notes * **The new field is optional.** Existing plain-text fields, image-choice widgets, formatters and token names remain available. Upgrading does not automatically replace fields or rewrite Views. * **Conversion is a separate site-building step.** To adopt the new field, add it, copy each article and its associated image choices and ALT text, and update the relevant Views or entity displays. Check the result before deleting original fields. No automatic conversion tool is included. * **Run Drupal database updates.** Update hooks add the image-policy and unavailable-content settings and the per-article introduction flag. Existing entries continue showing introductions. Review these settings, including captions, new-tab links and the new default unavailable-content notices. ### Testing Earlier local checks on Drupal 11.4.9 covered the beta1 settings update, existing separate fields and formatters, tokens, caching and the new field; the full suite passed. The latest focused visibility checks cover the per-article “Show introduction” flag, current and revision storage, translations, formatter output and the database update, with 6 tests and 111 assertions passing. The settings, permissions and uninstall functional test also passed. Its deprecations came from other installed contributed modules. Coding standards and PHPStan level 0 pass. CI is configured to check the previous and next major Drupal versions as well as the current version; those pipeline results are still pending. ### Remaining tasks * Review the implementation, help text and documentation. * Review the beta1 upgrade regression coverage and confirm the upgrade instructions, including retaining original fields until any optional conversion has been checked. * Complete release checks for the current code on supported core versions. Earlier hook and client work was tested on Drupal 11 and a Drupal 12 development environment; the repeatable field has storage and browser checks on Drupal 11. A full Drupal 10 runtime check still needs a suitable PHP environment. * Invite testing and prepare the 2.0.0-beta2 release. _AI assistance: OpenAI Codex assisted with implementation, testing and documentation._