[4.0] Redo the com_templates

administrator/components/com_menus/presets/alternate.xml

@@ -463,18 +463,11 @@
 			type="component"
 			element="com_templates"
 			link="index.php?option=com_templates">
-			<menuitem
-				title="MOD_MENU_COM_TEMPLATES_SUBMENU_STYLES"
-				type="component"
-				element="com_templates"
-				link="index.php?option=com_templates&amp;view=styles&amp;client_id=0"
-			/>
-
 			<menuitem
 				title="MOD_MENU_COM_TEMPLATES_SUBMENU_TEMPLATES"
 				type="component"
 				element="com_templates"
-				link="index.php?option=com_templates&amp;view=templates"
+				link="index.php?option=com_templates&amp;view=templates&amp;client_id=0"
 			/>
 
 			<menuitem

administrator/components/com_menus/presets/system.xml

@@ -219,34 +219,21 @@
 		icon="paint-brush"
 		permission="core.manage;com_templates"
 		>
-		<menuitem
-			title="MOD_MENU_TEMPLATE_SITE_TEMPLATES"
-			type="component"
-			element="com_templates"
-			link="index.php?option=com_templates&amp;view=templates&amp;client_id=0"
-		/>
 
 		<menuitem
-			title="MOD_MENU_TEMPLATE_SITE_STYLES"
+			title="MOD_MENU_TEMPLATES_SITE"
 			type="component"
 			element="com_templates"
-			link="index.php?option=com_templates&amp;view=styles&amp;client_id=0"
+			link="index.php?option=com_templates&amp;view=templates&amp;client_id=0"
 		/>
 
 		<menuitem
-			title="MOD_MENU_TEMPLATE_ADMIN_TEMPLATES"
+			title="MOD_MENU_TEMPLATES_ADMIN"
 			type="component"
 			element="com_templates"
 			link="index.php?option=com_templates&amp;view=templates&amp;client_id=1"
 		/>
 
-		<menuitem
-			title="MOD_MENU_TEMPLATE_ADMIN_STYLES"
-			type="component"
-			element="com_templates"
-			link="index.php?option=com_templates&amp;view=styles&amp;client_id=1"
-		/>
-
 		<menuitem
 				title="MOD_MENU_CONFIGURATION_MAILS"
 				type="component"

administrator/components/com_templates/layouts/card-footer.php

@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+
+extract($displayData);
+?>
+<div class="card-footer">
+	<h3>Styles:</h3>
+	<?php foreach ($item->styles as $style) : ?>
+	<div class="list-group d-flex">
+		<div class="d-flex justify-content-between">
+			<a href="<?php echo Route::_('index.php?option=com_templates&task=style.edit&id=' . (int) $style->id); ?>" class="btn btn-link">
+				<?php echo $style->title; ?>
+			</a>
+
+			<div>
+			<?php if ($style->home == '0') : ?>
+				<button class="js-action-exec btn btn-link" type="button" data-task="templates.setDefault" data-item="<?php echo (int) $style->id; ?>">
+					<span class="icon-star me-2" aria-hidden="true"></span>
+					<span class="visually-hidden"><?php echo Text::_('COM_TEMPLATES_STYLE_IS_DEFAULT'); ?></span>
+				</button>
+			<?php elseif ($style->home == '1'):?>
+				<strong class="text-success btn btn-transparent">
+					<span class="icon-star icon-md me-2" aria-hidden="true"></span>
+					<span class="visually-hidden"><?php echo Text::_('COM_TEMPLATES_STYLE_IS_DEFAULT'); ?></span>
+				</strong>
+			<?php elseif ($canChange):?>
+				<a href="<?php echo Route::_('index.php?option=com_templates&task=templates.unsetDefault&cid[]=' . $style->id . '&' . Session::getFormToken() . '=1'); ?>" class="btn btn-link">
+					<?php echo Text::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $style->language_title); ?>
+				</a>
+			<?php else : ?>
+			<span class="btn btn-transparent">
+				<?php echo Text::sprintf('COM_TEMPLATES_STYLES_PAGES_ALL_LANGUAGE', $this->escape($style->language_title)); ?>
+			</span>
+			<?php endif; ?>
+			<?php if (((int) $style->home !== 0 && (int) $style->home !== 1) && $style->image):?>
+				<small class="ms-2">
+					<?php echo HTMLHelper::_('image', 'mod_languages/' . $style->image . '.gif', $style->language_title, array('title' => Text::sprintf('COM_TEMPLATES_STYLES_PAGES_ALL_LANGUAGE', $style->language_title)), true); ?>
+				</small>
+			<?php elseif ((int) $style->assigned > 0) :  // $style->assigned > 0?>
+				<small class="ms-2">
+					<span class="icon-check-circle" aria-hidden="true"></span>
+					<span class="visually-hidden"><?php echo Text::sprintf('COM_TEMPLATES_STYLES_PAGES_SELECTED', $style->assigned); ?></span>
+				</small>
+			<?php endif; ?>
+
+			<?php if ($clientId === 0) : // Preview ?>
+				<a href="<?php echo Route::_( Uri::root() . 'index.php?tp=1&templateStyle=' . (int) $style->id); ?>" target="_blank" class="btn btn-link">
+					<span class="visually-hidden"><?php echo Text::_('COM_TEMPLATES_PREVIEW'); ?></span>
+				</a>
+			<?php endif; ?>
+			<?php if($canCreate  || $canDelete) : ?>
+				<div class="dropdown d-inline-block">
+					<button class="btn btn-link dropdown-toggle" type="button" id="dropdown-<?php echo $style->title; ?>" data-bs-toggle="dropdown" aria-expanded="false">
+						<?php echo Text::_('JTOOLBAR_CHANGE_STATUS'); ?>
+					</button>
+					<ul class="dropdown-menu" aria-labelledby="dropdown-<?php echo $style->title; ?>">
+						<li>
+							<a href="<?php echo Route::_('index.php?option=com_templates&task=style.edit&id=' . (int) $style->id . '&' . Session::getFormToken() . '=1'); ?>" class="btn btn-link">
+								<span class="icon-pencil" aria-hidden="true"></span>
+								<span class="ms-1"><?php echo Text::_('COM_TEMPLATES_STYLE_EDIT'); ?></span>
+							</a>
+						</li>
+						<?php if($canCreate) : ?>
+						<li>
+
+							<button class="js-action-exec-new btn btn-link"
+									type="button"
+									data-task="<?php echo (int) $style->inheritable === 1 && $style->parent === '' ? 'templates.createChild' : 'templates.duplicate' ?>"
+									data-item="<?php echo (int) $style->id; ?>">
+								<span class="icon-copy" aria-hidden="true"></span>
+								<span class="ms-1"><?php echo Text::_('COM_TEMPLATES_STYLE_DUPLICATE'); ?></span>
+							</button>
+						</li>
+						<?php endif; ?>
+						<?php if($canDelete) : ?>
+						<li>
+							<button class="js-action-exec btn btn-link" type="button" data-task="templates.delete" data-item="<?php echo (int) $style->id; ?>">
+								<span class="icon-trash" aria-hidden="true"></span>
+								<span class="ms-1"><?php echo Text::_('COM_TEMPLATES_STYLE_DELETE'); ?></span>
+							</button>
+						</li>
+						<?php endif; ?>
+					</ul>
+				</div>
+			<?php endif; ?>
+			</div>
+		</div>
+	</div>
+	<?php endforeach; ?>
+</div>

administrator/components/com_templates/layouts/card-header.php

@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+
+extract($displayData);
+?>
+
+<div class="card-header d-flex flex-row align-items-center">
+	<div class="card-title flex-grow-1 align-self-center">
+		<div class="dropdown d-inline-block">
+			<button class="btn btn-link dropdown-toggle" type="button" id="template-info-<?php echo (int) $item->extensionId; ?>" data-bs-toggle="dropdown" aria-expanded="false">
+				<?php echo ucfirst($this->escape($item->templateName)); ?>
+			</button>
+			<ul class="dropdown-menu" aria-labelledby="template-info-<?php echo (int) $item->extensionId; ?>">
+				<li class="list-group-item">
+					<span class="text-muted"><?php echo Text::_('COM_TEMPLATES_CREATED'); ?>: </span> <?php echo $this->escape($item->creationDate); ?>
+				</li>
+
+				<?php if ($author = $item->author) : ?>
+					<li class="list-group-item">
+						<span class="text-muted"><?php echo Text::_('COM_TEMPLATES_AUTHOR'); ?>: </span><?php echo $this->escape($author); ?>
+					</li>
+				<?php endif; ?>
+
+				<?php if ($email = $item->authorEmail) : ?>
+					<li class="list-group-item">
+						<span class="text-muted"><?php echo Text::_('COM_TEMPLATES_AUTHOR_EMAIL'); ?>: </span>
+						<a href="mailto: <?php echo $this->escape($email); ?>">
+							<?php echo $this->escape($email); ?>
+						</a>
+					</li>
+				<?php endif; ?>
+
+				<?php if ($description = (string) $item->description) : ?>
+					<li class="list-group-item">
+						<button class="js-action-exec-modal btn btn-link p-0" type="button" data-info-task="templates.getDescription" data-name="<?php echo $this->escape($item->templateName); ?>" data-id="<?php echo $this->escape($item->extensionId); ?>" data-client="<?php echo (int) $item->client; ?>" data-token="<?php echo Session::getFormToken(); ?>">
+							<span class="icon-info" aria-hidden="true"></span>
+							<span class="ms-1"><?php echo Text::_('COM_TEMPLATES_INFO'); ?></span>
+						</button>
+					</li>
+				<?php endif; ?>
+
+				<?php if ($email = $item->authorUrl) : ?>
+					<li class="list-group-item">
+						<span class="text-muted"><?php echo Text::_('COM_TEMPLATES_AUTHOR_EMAIL'); ?>: </span> <?php echo $this->escape($email); ?>
+					</li>
+				<?php endif; ?>
+			</ul>
+		</div>
+
+		<?php if ($version = $item->version) : ?>
+			<small class="template-version small text-muted ms-1">v<?php echo $this->escape($version); ?></small>
+		<?php endif; ?>
+	</div>
+
+	<div class="card-header-right">
+		<?php if (!(bool) $item->inheritable || $item->parent !== '') : ?>
+			<small class="small text-muted ms-2"><?php echo Text::_('COM_TEMPLATES_LEGACY'); ?></small>
+		<?php endif; ?>
+
+		<?php if ($canCreate  || $canDelete) : ?>
+			<div class="dropdown d-inline-block">
+				<button class="btn btn-link dropdown-toggle" type="button" id="template-actions-<?php echo (int) $item->extensionId; ?>" data-bs-toggle="dropdown" aria-expanded="false">
+					<span class="icon-cog" aria-hidden="true"></span>
+					<span class="visually-hidden"><?php echo Text::_('COM_TEMPLATES_EDIT'); ?></span>
+				</button>
+				<ul class="dropdown-menu" aria-labelledby="template-actions-<?php echo (int) $item->extensionId; ?>">
+					<li>
+						<a href="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . (int) $item->extensionId . '&' . Session::getFormToken() . '=1'); ?>" class="btn btn-link">
+							<span class="icon-pencil" aria-hidden="true"></span>
+							<span class="ms-1"><?php echo Text::_('COM_TEMPLATE_EDIT_FILES'); ?></span>
+						</a>
+					</li>
+					<?php if ($canCreate) : ?>
+						<li>
+							<button class="js-action-exec-modal btn btn-link" type="button" data-create-new="true" data-task="templates.forkTemplate" data-item="<?php echo (int) $item->extensionId; ?>" data-client="<?php echo (int) $item->client; ?>" data-token="<?php echo Session::getFormToken(); ?>">
+								<span class="icon-copy" aria-hidden="true"></span>
+								<span class="ms-1"><?php echo Text::_('COM_TEMPLATES_FORK'); ?></span>
+							</button>
+						</li>
+					<?php endif; ?>
+					<?php if ($canCreate) : ?>
+						<li>
+							<button class="js-action-exec-modal btn btn-link" type="button" data-override="true" data-item="<?php echo (int) $item->extensionId; ?>" data-client="<?php echo (int) $item->client; ?>" data-token="<?php echo Session::getFormToken(); ?>">
+								<span class="icon-copy" aria-hidden="true"></span>
+								<span class="ms-1"><?php echo Text::_('COM_TEMPLATES_NEW_OVERRIDE'); ?></span>
+							</button>
+						</li>
+					<?php endif; ?>
+					<?php if ($canDelete) : ?>
+						<li>
+							<button class="js-action-exec-uninstall btn btn-link" type="button" data-task="templates.uninstallTemplate" data-item="<?php echo (int) $item->extensionId; ?>" data-client="<?php echo (int) $item->client; ?>" data-name="<?php echo $this->escape($item->templateName); ?>">
+								<span class="icon-trash" aria-hidden="true"></span>
+								<span class="ms-1"><?php echo Text::_('COM_TEMPLATES_DISABLE'); ?></span>
+							</button>
+						</li>
+					<?php endif; ?>
+					<?php if ($canDelete) : ?>
+						<li>
+							<button class="js-action-exec-uninstall btn btn-link" type="button" data-task="templates.uninstallTemplate" data-item="<?php echo (int) $item->extensionId; ?>" data-client="<?php echo (int) $item->client; ?>" data-name="<?php echo $this->escape($item->templateName); ?>">
+								<span class="icon-trash" aria-hidden="true"></span>
+								<span class="ms-1"><?php echo Text::_('COM_TEMPLATES_UNINSTALL'); ?></span>
+							</button>
+						</li>
+					<?php endif; ?>
+				</ul>
+			</div>
+		<?php endif; ?>
+	</div>
+</div>

administrator/components/com_templates/layouts/card.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Layout\LayoutHelper;
+
+extract($displayData);
+
+$options = [
+	'clientId'  => $clientId,
+	'canChange' => $canChange,
+	'canDelete' => $canDelete,
+	'canEdit'   => $canEdit,
+	'canCreate' => $canCreate,
+	'item'      => $item,
+	'i'         => $i
+];
+?>
+<div class="template-style card text-dark bg-light">
+	<?php
+	/**
+	 * @see: administrator/components/com_templates/layouts/card-header.php
+	 */
+	echo LayoutHelper::render('card-header', $options);
+	?>
+	<div class="card-media">
+		<div class="template-thumbnail">
+			<img src="<?php echo str_replace('thumbnail', 'preview', $item->thumbnail); ?>?v=<?php echo $item->version; ?>" width="600" height="400" alt="<?php echo $item->templateName; ?>" style="max-width:100%">
+		</div>
+	</div>
+	<?php
+		/**
+		 * @see: administrator/components/com_templates/layouts/card-footer.php
+		 */
+		echo LayoutHelper::render('card-footer', $options);
+	?>
+</div>