Allow hide theme for email and page constructors Mautic 5

app/bundles/CoreBundle/Form/Type/ThemeListType.php

@@ -23,9 +23,16 @@ public function configureOptions(OptionsResolver $resolver): void
         $resolver->setDefaults(
             [
                 'choices'           => function (Options $options): array {
-                    $themes                     = $this->themeHelper->getInstalledThemes($options['feature']);
+                    $themes                     = $this->themeHelper->getInstalledThemes($options['feature'], false, true);
                     $themes['mautic_code_mode'] = 'Code Mode';
 
+                    // Hide themes that are marked as hidden
+                    foreach ($this->themeHelper->getInstalledThemes($options['feature'], true, true) as $themeKey => $themeInfo) {
+                        if (in_array('hide', $themeInfo['config']) && true === $themeInfo['config']['hide']) {
+                            unset($themes[$themeKey]);
+                        }
+                    }
+
                     return array_flip($themes);
                 },
                 'expanded'          => false,

app/bundles/CoreBundle/Helper/ThemeHelper.php

@@ -222,6 +222,9 @@ public function checkForTwigTemplate($template): string
         return $this->findThemeWithTemplate($template);
     }
 
+    /**
+     * @return array<mixed>
+     */
     public function getInstalledThemes($specificFeature = 'all', $extended = false, $ignoreCache = false, $includeDirs = true)
     {
         // Use a concatenated key since $includeDirs changes what's returned ($includeDirs used by API controller to prevent from exposing file paths)

app/bundles/CoreBundle/Helper/ThemeHelperInterface.php

@@ -84,7 +84,7 @@ public function checkForTwigTemplate($template);
      * @param bool   $ignoreCache     true to get the fresh info
      * @param bool   $includeDirs     true to get the theme dir details
      *
-     * @return array<string[]>|string[]
+     * @return array<mixed>
      */
     public function getInstalledThemes($specificFeature = 'all', $extended = false, $ignoreCache = false, $includeDirs = true);
 

app/bundles/CoreBundle/Resources/views/Helper/theme_select.html.twig

@@ -26,53 +26,55 @@
       </div>
       {% for themeKey, themeInfo in themes %}
           {% set isSelected = active is same as themeKey %}
-          {% if not isSelected or themeInfo.config.features is not defined or type in themeInfo.config.features %}
-            {% if (themeInfo.dir ~ '/thumbnail_' ~ type ~ '.png') is file %}
-                {% set thumbnailName, hasThumbnail = 'thumbnail_' ~ type ~ '.png', true %}
-            {% else %}
-                {% set thumbnailName = 'thumbnail.png' %}
-                {% set hasThumbnail = is_file(themeInfo.dir ~ '/' ~ thumbnailName) %}
-            {% endif %}
-            {% set thumbnailUrl = getAssetUrl(themeInfo.themesLocalDir ~ '/' ~ themeKey ~ '/' ~ thumbnailName) %}
-            <div class="col-md-3 theme-list">
-                <div class="panel panel-default {% if isSelected %}theme-selected{% endif %}">
-                    <div class="panel-body text-center">
-                        <h3>{{ themeInfo.name }}</h3>
-                        {% if hasThumbnail %}
-                            <a href="#" data-toggle="modal" data-target="#theme-{{ themeKey }}">
-                                <div style="background-image: url({{ thumbnailUrl }});background-repeat:no-repeat;background-size:contain; background-position:center; width: 100%; height: 250px"></div>
-                            </a>
-                        {% else %}
-                            <div class="panel-body text-center" style="height: 250px">
-                                <i class="fa fa-file-image-o fa-5x text-muted" aria-hidden="true" style="padding-top: 75px; color: #E4E4E4;"></i>
+            {% if not isSelected or themeInfo.config.features is not defined or type in themeInfo.config.features %}
+                {% if themeInfo.config.hide is not defined or not themeInfo.config.hide is same as(true) %}
+                    {% if (themeInfo.dir ~ '/thumbnail_' ~ type ~ '.png') is file %}
+                        {% set thumbnailName, hasThumbnail = 'thumbnail_' ~ type ~ '.png', true %}
+                    {% else %}
+                        {% set thumbnailName = 'thumbnail.png' %}
+                        {% set hasThumbnail = is_file(themeInfo.dir ~ '/' ~ thumbnailName) %}
+                    {% endif %}
+                    {% set thumbnailUrl = getAssetUrl(themeInfo.themesLocalDir ~ '/' ~ themeKey ~ '/' ~ thumbnailName) %}
+                    <div class="col-md-3 theme-list">
+                        <div class="panel panel-default {% if isSelected %}theme-selected{% endif %}">
+                            <div class="panel-body text-center">
+                                <h3>{{ themeInfo.name }}</h3>
+                                {% if hasThumbnail %}
+                                    <a href="#" data-toggle="modal" data-target="#theme-{{ themeKey }}">
+                                        <div style="background-image: url({{ thumbnailUrl }});background-repeat:no-repeat;background-size:contain; background-position:center; width: 100%; height: 250px"></div>
+                                    </a>
+                                {% else %}
+                                    <div class="panel-body text-center" style="height: 250px">
+                                        <i class="fa fa-file-image-o fa-5x text-muted" aria-hidden="true" style="padding-top: 75px; color: #E4E4E4;"></i>
+                                    </div>
+                                {% endif %}
+                                <a href="#" type="button" data-theme="{{ themeKey }}" class="select-theme-link btn btn-default {% if isSelected %}hide{% endif %}" onclick="mQuery('#dynamic-content-tab').addClass('hidden')">
+                                    Select
+                                </a>
+                                <button type="button" class="select-theme-selected btn btn-default {% if not isSelected %}hide{% endif %}" disabled="disabled">
+                                    Selected
+                                </button>
                             </div>
-                        {% endif %}
-                        <a href="#" type="button" data-theme="{{ themeKey }}" class="select-theme-link btn btn-default {% if isSelected %}hide{% endif %}" onclick="mQuery('#dynamic-content-tab').addClass('hidden')">
-                            Select
-                        </a>
-                        <button type="button" class="select-theme-selected btn btn-default {% if not isSelected %}hide{% endif %}" disabled="disabled">
-                            Selected
-                        </button>
-                    </div>
-                </div>
-                {% if hasThumbnail %}
-                    <!-- Modal -->
-                    <div class="modal fade" id="theme-{{ themeKey }}" tabindex="-1" role="dialog" aria-labelledby="{{ themeKey }}">
-                        <div class="modal-dialog" role="document">
-                            <div class="modal-content">
-                                <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                                    <h4 class="modal-title" id="{{ themeKey }}">{{ themeInfo.name }}</h4>
-                                </div>
-                                <div class="modal-body">
-                                    <div style="background-image: url({{ thumbnailUrl }});background-repeat:no-repeat;background-size:contain; background-position:center; width: 100%; height: 600px"></div>
+                        </div>
+                        {% if hasThumbnail %}
+                            <!-- Modal -->
+                            <div class="modal fade" id="theme-{{ themeKey }}" tabindex="-1" role="dialog" aria-labelledby="{{ themeKey }}">
+                                <div class="modal-dialog" role="document">
+                                    <div class="modal-content">
+                                        <div class="modal-header">
+                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                                            <h4 class="modal-title" id="{{ themeKey }}">{{ themeInfo.name }}</h4>
+                                        </div>
+                                        <div class="modal-body">
+                                            <div style="background-image: url({{ thumbnailUrl }});background-repeat:no-repeat;background-size:contain; background-position:center; width: 100%; height: 600px"></div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
+                        {% endif %}
                     </div>
                 {% endif %}
-            </div>
-          {% endif %}
+            {% endif %}
       {% endfor %}
       <div class="clearfix"></div>
   </div>

app/bundles/CoreBundle/Resources/views/Theme/list.html.twig

@@ -96,6 +96,9 @@
                             <td>
                                 <div>
                                     {{ item['name']|e }} ({{ item['key']|e }})
+                                    {% if item['config']['hide'] is defined and item['config']['hide'] is same as(true) %}
+										<i class="fa fa-eye-slash"></i>
+									{% endif %}
                                 </div>
                             </td>
                             <td>

themes/skyline/composer.json

@@ -10,4 +10,4 @@
   "require": {
     "mautic/core-lib": "^5.0"
   }
-}
+}