Fix errors for expandable table shortcode

content/en/docs/community-tools/contribute-to-mendix-docs/markdown-shortcodes.md

@@ -110,33 +110,52 @@ public class Hello1
 
 ### Expandable Tables
 
-Use the `expandable-table` shortcode to add an **Expand Table** button above a wide table. When readers click the button, the table opens in a window on the same page, which makes it easier to read. Place the table between the opening and closing tags, with a blank line after the opening tag and before the closing tag:
+Use the `expandable-table` shortcode to add an **Expand Table** button above a wide table. When readers click the button, the table opens in a window on the same page, which makes it easier to read. Place the table between the opening and closing tags, with a blank line after the opening tag and before the closing tag. Use the `<` delimiter, as in the following example:
 
-{{% expandable-table %}}
+{{< expandable-table >}}
 
 | Column1 | Column2 |
 | --- | --- |
 | Item1 | Item2 |
 | Item3 | Item4 |
 
-{{% /expandable-table %}}
+{{< /expandable-table >}}
 
 The optional `title` parameter sets the title shown at the top of the window. If you omit it or leave it blank, the window has no title.
 
 Here is an example:
 
-{{% expandable-table title="Title of the table" %}}
+{{< expandable-table title="Title of the table" >}}
 
 | Column1 | Column2 |
 | --- | --- |
 | Item1 | Item2 |
 | Item3 | Item4 |
 
-{{% /expandable-table %}}
+{{< /expandable-table >}}
+
+#### Shortcodes in Expandable Tables
+
+You can use other shortcodes, such as `alert` and `figure`, inside a table cell. Write the shortcode in the cell as you would elsewhere on the page. The expandable table joins the lines of the shortcode output, so the table row is not broken:
+
+{{< expandable-table title="Table with an alert" >}}
+
+| Column1 | Column2 |
+| --- | --- |
+| Item1 | Item2 {{% alert color="info" %}}This is an alert in a table cell.{{% /alert %}} |
+| Item3 | Item4 |
+
+{{< /expandable-table >}}
+
+Keep the following in mind:
+
+* Write each table row on a single line.
+* Place only table rows between the opening and closing tags. The shortcode joins any line that does not start with `|` to the previous line.
+* Fenced code blocks cannot be used in a table cell. Use inline code instead.
 
 #### Expandable Tables in Lists
 
-To use the shortcode in a list item, indent the shortcode tags and the table by four spaces, like any other content in the list item, and use the `<` delimiter instead of `%`. The shortcode removes the indentation from the table, so the table does not render as a code block:
+To use the shortcode in a list item, indent the shortcode tags and the table by four spaces, like any other content in the list item. The shortcode removes the indentation from the table, so the table does not render as a code block:
 
 1. Step 1.
 

content/en/docs/marketplace/platform-supported-content/modules/SAML/saml-installation-configuration.md

@@ -62,7 +62,7 @@ If you use this method, do not forget to set the **SSOLandingPage** constant to
 
 The table below introduces you to several key updates when you upgrade the SAML module from V3.x to V4.x.
 
-{{% expandable-table title="Changes in SAML Module Version 4.X" %}}
+{{< expandable-table title="Changes in SAML Module Version 4.X" >}}
 
 | Feature | Changes in Version 4.X |
 | --- | --- |
@@ -72,7 +72,7 @@ The table below introduces you to several key updates when you upgrade the SAML
 | InCommon Federation Support | Pre-configured support for InCommon Federation has been removed. You now need to create custom user provisioning microflows in version 4.0.0 |
 | MxModeleReflection | In the **MxObjects_Overview** page, the MxModeleReflection module refresh is no longer required. It is handled automatically in the **SAML20.Startup**. |
 
-{{% /expandable-table %}}
+{{< /expandable-table >}}
 
 ## Choosing a SAML Configuration Approach{#config-approach}
 
@@ -220,7 +220,7 @@ The following entities are used to create IdP configurations:
 
 The table below shows you the different attributes and their values for quick reference. You can see the details of these attributes of the above entities in the [Reference Guide for SAML IdP Configuration](/appstore/modules/saml/idp-attributes/) document.
 
-{{% expandable-table title="IdP Configuration Attributes" %}}
+{{< expandable-table title="IdP Configuration Attributes" >}}
 
 | IDPConfiguration(Non-Persistable entity) | Description | Default Value |
 | --- | --- | --- |
@@ -260,7 +260,7 @@ The table below shows you the different attributes and their values for quick re
 | **EncryptionKeyLength** | This constant represents the Encryption length | 2048 bits |
 | Active | After completion of IdP config it will make the Toggle Active | true |
 
-{{% /expandable-table %}}
+{{< /expandable-table >}}
 
 Deploy the application and log in with the SSO. For more information, see the [Deploy the Application and Login with SSO](#deploy-application) section above.
 

content/en/docs/marketplace/platform-supported-content/modules/oidc.md

@@ -201,7 +201,7 @@ If your app is already developed using Mendix 9 or above, but uses the community
 
 This section provides an overview of updates for the OIDC SSO module across different versions. It includes new dependencies, snippet replacements, and microflow renaming to ensure a smooth transition while migrating to higher module versions.
 
-{{% expandable-table %}}
+{{< expandable-table >}}
 
 | Mendix Version | OIDC SSO Module Version | Important Migration Changes | Additional Information |
 | --- | --- | --- | --- |
@@ -227,7 +227,7 @@ This section provides an overview of updates for the OIDC SSO module across diff
 | 9.24.2 and above | 3.0.0 (migrating to 3.0.0 and above) | Include [UserCommons](https://marketplace.mendix.com/link/component/223053) module as a dependency. | New UserCommons module |
 | | | Set `OIDC.Startup` microflow as part of the after-startup microflow. | Assign UserProvisioning for existing IdP configurations. |
 
-{{% /expandable-table %}}
+{{< /expandable-table >}}
 
 ## Design-time App Configuration{#app-configuration}
 
@@ -241,14 +241,14 @@ If you are using OIDC module version 3.1.0 and above, you need to configure your
 
 Ensure that you have allocated the following user roles to the OIDC module and UserCommons (in version 3.0.0 and above) roles:
 
-{{% expandable-table %}}
+{{< expandable-table >}}
 
 | User Role | OIDC Module Role |
 | --- | --- |
 | Administrator | OIDC.Administrator, UserCommons.Administrator |
 | User | OIDC.User |
 
-{{% /expandable-table %}}
+{{< /expandable-table >}}
 
 {{< figure src="/attachments/appstore/platform-supported-content/modules/oidc/user-roles.png" alt="User roles tab showing Administrator and User roles with their assigned module roles" >}}
 
@@ -635,7 +635,7 @@ You can set up custom user provisioning by setting constants when you deploy you
 
 You can set up custom user provisioning by setting the following constants. You can set default values when you build your app, but you can override these in the app's environment.
 
-{{% expandable-table %}}
+{{< expandable-table >}}
 
 | Constant | Use | Notes | Example |
 | --- | --- | --- | --- |
@@ -649,7 +649,7 @@ You can set up custom user provisioning by setting the following constants. You
 | `CustomUserProvisioning` | a custom microflow to use for user provisioning | *optional* – in the form `modulename.microflowname` – the microflow name must begin with the string `UC_CustomProvisioning` | `Mymodule.UC_CustomProvisioning` |
 | `DisableMxAdmin` | deactivates Mx admin | *optional* | `True` |
 
-{{% /expandable-table %}}
+{{< /expandable-table >}}
 
 {{% alert color="info" %}}
 You may have a requirement that users log in to your application only via SSO. However, when you deploy your app on the Mendix Cloud, the platform may still create an MxAdmin user with a local password. From version 2.1.0 of the UserCommons module, if the flag for the `DisableMxAdmin` constant is set to `True`, the MxAdmin user will be deactivated via the startup microflow `ASU_UserCommons_StartUp`.
@@ -706,15 +706,15 @@ If the standard configuration meets your needs and your application does not hav
 
 In the default configuration, the custom user entity is set as `Administration.Account`, the principal attribute is set as `Name`, and the default attribute mapping is provided.
 
-{{% expandable-table title=" Default Attribute Mapping"%}}
+{{< expandable-table title="Attribute Mapping" >}}
 
 |  IdP Attribute       | Configured Entity Attribute |
 | -------------------- | --------------------------- |
 | email                | Email                       |
 | name                 | FullName                    |
 | sub                  | Name                        |
 
-{{% /expandable-table %}}
+{{< /expandable-table >}}
 
 ##### Modifying Default Attribute Mapping{#modify-default}
 
@@ -779,15 +779,15 @@ The section below shows the methods to configure user provisioning when using OI
 
 By default, the `CUSTOM_UserProvisioning` microflow in the **USE_ME** > **1. Configuration** folder of the OIDC module uses the `OIDC_CustomUserParsing_Standard` microflow. This applies to the following mapping:
 
-{{% expandable-table %}}
+{{< expandable-table >}}
 
 | ID-token Provided by your IdP | Attribute of `Administration.Account` Object |
 | ----------------------------- | -----------------------------                | 
 | sub                           | Name                                         |
 | name                          | Fullname                                     |
 | email                         | Email                                        |
 
-{{% /expandable-table %}}
+{{< /expandable-table >}}
 
 {{% alert color="warning" %}}
 Do not change the `UserProvisioning_StandardOIDC` microflow. This may cause problems if you upgrade to a newer version of the OIDC SSO module. Apply customizations to the `CUSTOM_UserProvisioning` microflow only.

content/en/docs/refguide/runtime/custom-settings/_index.md

@@ -44,6 +44,8 @@ Durations and intervals can be specified in the following formats:
 
 The following custom settings can be configured:
 
+{{< expandable-table >}}
+
 | Name | Description | Default Value |
 | --- | --- | --- |
 | <a id="ApplicationRootUrl" href="#ApplicationRootUrl">ApplicationRootUrl</a> | see [ApplicationRootUrl](#applicationrooturl-section), below | In Mendix Cloud, https://\[domain\].<wbr>mendixcloud.<wbr>com |
@@ -89,6 +91,8 @@ The following custom settings can be configured:
 | <a id="SessionKeepAliveUpdateBatchSize" href="#SessionKeepAliveUpdateBatchSize">SessionKeepAliveUpdateBatchSize</a> | This setting specifies how many sessions should be updated per batch when updating the `LastActive` attribute in the periodic system task. | 1000 *Introduced in Mendix 11.6.1 and 11.7.0.* |
 | <a id="UseOldExceptionBehavior" href="#UseOldExceptionBehavior">UseOldExceptionBehavior</a> | Allows you to set the exception message and wrapping behavior in the Mendix Runtime Server to the behavior below Mendix version 11.6.0. From Mendix 11.6.0 we changed the way messages are constructed to prevent the actual cause of the error being hidden in the details and exception wrapping is reduced significantly.<br/><br/>This change means that error messages will be different and have a significantly less deep exception nesting. Consequently, code which depends on finding some specific exception hardcoded at X levels deep (using `exception.getCause().getCause()` for example), will probably fail.<br/><br/>To restore the previous behavior, set `UseOldExceptionBehavior` to `true`. | false *Introduced in Mendix 11.6.0.* |
 
+{{< /expandable-table >}}
+
 ### ApplicationRootUrl {#applicationrooturl-section}
 
 The ApplicationRootUrl setting is used to specify the protocol, domain, and path to your application. This can be used within Java actions to get the public location of the application, for example when including a URL to the application when sending emails from a scheduled event.
@@ -121,12 +125,16 @@ Mendix systems like OData that generate content based on a http request to the s
 
 The settings below influence the behavior of the log files. These settings can only be used on premises. In the cloud, these settings do not change any behavior.
 
+{{< expandable-table >}}
+
 | Name | Description | Default Value |
 | --- | --- | --- |
 | <a id="LogFileName" href="#LogFileName">LogFileName</a> | The name of the log file. The log files (actual log file plus back-up files) will be placed in the folder specified by the setting log path. | Application.log |
 | <a id="MaxLogFileSize" href="#MaxLogFileSize">MaxLogFileSize</a> | The maximum size per log file. When the log file reaches this maximum size, the log file will be backed up and a new empty log file will be used. | 2097152 (2 MB) |
 | <a id="MaxLogFileCount" href="#MaxLogFileCount">MaxLogFileCount</a> | The maximum count of log files preserved (actual file plus back-up files). When the maximum count is reached, the oldest backup file will be removed. | 10 |
 
+{{< /expandable-table >}}
+
 ## Database Settings {#database-settings}
 
 ### Common Settings

layouts/shortcodes/expandable-table.html

@@ -8,7 +8,8 @@
     </div>
     <div class="expandable-table-inner">
         {{/* Strip leading indentation so tables indented inside a list are not rendered as code blocks */}}
-        {{ .Inner | replaceRE `(?m)^[ \t]+` "" | markdownify | safeHTML }}
+        {{/* Join lines that do not start with a pipe to the previous line, so multi-line output of shortcodes (for example, alert and figure) inside a table cell does not end the table row */}}
+        {{ .Inner | replaceRE `(?m)^[ \t]+` "" | replaceRE `\s*\n\s*([^|\s])` " $1" | markdownify | safeHTML }}
     </div>
 </div>