first commit
This commit is contained in:
@ -0,0 +1,80 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @package Joomla.Administrator
|
||||
* @subpackage com_contenthistory
|
||||
*
|
||||
* @copyright (C) 2013 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\Language\Text;
|
||||
use Joomla\CMS\Session\Session;
|
||||
|
||||
Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
|
||||
|
||||
$version2 = $this->items[0];
|
||||
$version1 = $this->items[1];
|
||||
$object1 = $version1->data;
|
||||
$object2 = $version2->data;
|
||||
|
||||
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
|
||||
$wa = $this->document->getWebAssetManager();
|
||||
$wa->useScript('com_contenthistory.admin-compare-compare');
|
||||
|
||||
?>
|
||||
<div role="main">
|
||||
<h1 class="mb-3"><?php echo Text::_('COM_CONTENTHISTORY_COMPARE_TITLE'); ?></h1>
|
||||
|
||||
<table id="diff" class="table">
|
||||
<caption class="visually-hidden">
|
||||
<?php echo Text::_('COM_CONTENTHISTORY_COMPARE_CAPTION'); ?>
|
||||
</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" class="w-25"><?php echo Text::_('COM_CONTENTHISTORY_PREVIEW_FIELD'); ?></th>
|
||||
<th scope="col"><?php echo Text::_('COM_CONTENTHISTORY_COMPARE_OLD'); ?></th>
|
||||
<th scope="col"><?php echo Text::_('COM_CONTENTHISTORY_COMPARE_NEW'); ?></th>
|
||||
<th scope="col"><?php echo Text::_('COM_CONTENTHISTORY_COMPARE_DIFF'); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($object1 as $name => $value) : ?>
|
||||
<?php if (isset($value->value) && isset($object2->$name->value) && $value->value != $object2->$name->value) : ?>
|
||||
<?php if (is_object($value->value)) : ?>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<strong><?php echo $value->label; ?></strong>
|
||||
</td>
|
||||
</tr>
|
||||
<?php foreach ($value->value as $subName => $subValue) : ?>
|
||||
<?php $newSubValue = $object2->$name->value->$subName->value ?? ''; ?>
|
||||
<?php if ($subValue->value || $newSubValue) : ?>
|
||||
<?php if ($subValue->value != $newSubValue) : ?>
|
||||
<tr>
|
||||
<th scope="row"><em> <?php echo $subValue->label; ?></em></th>
|
||||
<td class="original"><?php echo htmlspecialchars($subValue->value, ENT_COMPAT, 'UTF-8'); ?></td>
|
||||
<td class="changed" ><?php echo htmlspecialchars($newSubValue, ENT_COMPAT, 'UTF-8'); ?></td>
|
||||
<td class="diff"> </td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
<?php endforeach; ?>
|
||||
<?php else : ?>
|
||||
<tr>
|
||||
<th scope="row">
|
||||
<?php echo $value->label; ?>
|
||||
</th>
|
||||
<td class="original"><?php echo htmlspecialchars($value->value); ?></td>
|
||||
<?php $object2->$name->value = is_object($object2->$name->value) ? json_encode($object2->$name->value) : $object2->$name->value; ?>
|
||||
<td class="changed"><?php echo htmlspecialchars($object2->$name->value, ENT_COMPAT, 'UTF-8'); ?></td>
|
||||
<td class="diff"> </td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@ -0,0 +1,122 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @package Joomla.Administrator
|
||||
* @subpackage com_contenthistory
|
||||
*
|
||||
* @copyright (C) 2013 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\Language\Text;
|
||||
use Joomla\CMS\Router\Route;
|
||||
use Joomla\CMS\Session\Session;
|
||||
|
||||
Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
|
||||
|
||||
$hash = $this->state->get('sha1_hash');
|
||||
$formUrl = 'index.php?option=com_contenthistory&view=history&layout=modal&tmpl=component&item_id=' . $this->state->get('item_id') . '&' . Session::getFormToken() . '=1';
|
||||
|
||||
Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION', true);
|
||||
Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_TWO_VERSIONS', true);
|
||||
Text::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
|
||||
|
||||
$inlineJS = <<<JS
|
||||
document.querySelectorAll('.js-link-open-window').forEach((link) => link.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
window.open(link.dataset.url, 'win2', 'width=800,height=600,resizable=yes,scrollbars=yes')
|
||||
}));
|
||||
JS;
|
||||
|
||||
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
|
||||
$wa = $this->document->getWebAssetManager();
|
||||
$wa->useScript('multiselect')
|
||||
->useScript('com_contenthistory.admin-history-modal')
|
||||
->useScript('list-view')
|
||||
->addInlineScript($inlineJS, [], ['type' => 'module']);
|
||||
?>
|
||||
<div class="container-popup">
|
||||
<div id="subhead" class="subhead noshadow mb-3">
|
||||
<?php echo $this->toolbar->render(); ?>
|
||||
</div>
|
||||
<form action="<?php echo Route::_($formUrl); ?>" method="post" name="adminForm" id="adminForm">
|
||||
<table class="table table-sm">
|
||||
<caption class="visually-hidden">
|
||||
<?php echo Text::_('COM_CONTENTHISTORY_VERSION_CAPTION'); ?>
|
||||
</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<td class="w-1 text-center">
|
||||
<input class="form-check-input" type="checkbox" name="checkall-toggle" value="" title="<?php echo Text::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)">
|
||||
</td>
|
||||
<th scope="col" class="w-15">
|
||||
<?php echo Text::_('JDATE'); ?>
|
||||
</th>
|
||||
<th scope="col" class="w-15 d-none d-md-table-cell">
|
||||
<?php echo Text::_('COM_CONTENTHISTORY_VERSION_NOTE'); ?>
|
||||
</th>
|
||||
<th scope="col" class="w-10">
|
||||
<?php echo Text::_('COM_CONTENTHISTORY_KEEP_VERSION'); ?>
|
||||
</th>
|
||||
<th scope="col" class="w-15 d-none d-md-table-cell">
|
||||
<?php echo Text::_('JAUTHOR'); ?>
|
||||
</th>
|
||||
<th scope="col" class="w-10 text-end">
|
||||
<?php echo Text::_('COM_CONTENTHISTORY_CHARACTER_COUNT'); ?>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php $i = 0; ?>
|
||||
<?php foreach ($this->items as $item) : ?>
|
||||
<tr class="row<?php echo $i % 2; ?>">
|
||||
<td class="text-center">
|
||||
<?php echo HTMLHelper::_('grid.id', $i, $item->version_id, false, 'cid', 'cb', $item->save_date); ?>
|
||||
</td>
|
||||
<th scope="row">
|
||||
<a href="#" class="js-link-open-window save-date" data-url="<?php echo Route::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . Session::getFormToken() . '=1&version_id=' . $item->version_id); ?>">
|
||||
<?php echo HTMLHelper::_('date', $item->save_date, Text::_('DATE_FORMAT_LC6')); ?>
|
||||
</a>
|
||||
<?php if ($item->sha1_hash == $hash) : ?>
|
||||
<span class="icon-star" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('JCURRENT'); ?></span>
|
||||
<?php endif; ?>
|
||||
</th>
|
||||
<td class="d-none d-md-table-cell">
|
||||
<?php echo htmlspecialchars($item->version_note); ?>
|
||||
</td>
|
||||
<td>
|
||||
<?php if ($item->keep_forever) : ?>
|
||||
<button type="button" class="js-grid-item-action btn btn-secondary btn-sm" data-item-id="cb<?php echo $i; ?>" data-item-task="history.keep">
|
||||
<?php echo Text::_('JYES'); ?>
|
||||
<span class="icon-lock" aria-hidden="true"></span>
|
||||
</button>
|
||||
<?php else : ?>
|
||||
<button type="button" class="js-grid-item-action btn btn-secondary btn-sm" data-item-id="cb<?php echo $i; ?>" data-item-task="history.keep">
|
||||
<?php echo Text::_('JNO'); ?>
|
||||
</button>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td class="d-none d-md-table-cell">
|
||||
<?php echo htmlspecialchars($item->editor); ?>
|
||||
</td>
|
||||
<td class="text-end">
|
||||
<?php echo number_format((int) $item->character_count, 0, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR')); ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php $i++; ?>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<?php /* load the pagination. */ ?>
|
||||
<?php echo $this->pagination->getListFooter(); ?>
|
||||
|
||||
<input type="hidden" name="task" value="">
|
||||
<input type="hidden" name="boxchecked" value="0">
|
||||
<?php echo HTMLHelper::_('form.token'); ?>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
@ -0,0 +1,65 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @package Joomla.Administrator
|
||||
* @subpackage com_contenthistory
|
||||
*
|
||||
* @copyright (C) 2013 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\Language\Text;
|
||||
use Joomla\CMS\Session\Session;
|
||||
|
||||
Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
|
||||
|
||||
?>
|
||||
<div role="main">
|
||||
<h1>
|
||||
<?php echo Text::sprintf('COM_CONTENTHISTORY_PREVIEW_SUBTITLE_DATE', $this->item->save_date); ?>
|
||||
</h1>
|
||||
<?php if ($this->item->version_note) : ?>
|
||||
<h2>
|
||||
<?php echo Text::sprintf('COM_CONTENTHISTORY_PREVIEW_SUBTITLE', $this->item->version_note); ?>
|
||||
</h2>
|
||||
<?php endif; ?>
|
||||
|
||||
<table class="table">
|
||||
<caption class="visually-hidden">
|
||||
<?php echo Text::_('COM_CONTENTHISTORY_PREVIEW_CAPTION'); ?>
|
||||
</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="w-25" scope="col"><?php echo Text::_('COM_CONTENTHISTORY_PREVIEW_FIELD'); ?></th>
|
||||
<th scope="col"><?php echo Text::_('COM_CONTENTHISTORY_PREVIEW_VALUE'); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($this->item->data as $name => $value) : ?>
|
||||
<?php if (is_object($value->value)) : ?>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<?php echo $value->label; ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php foreach ($value->value as $subName => $subValue) : ?>
|
||||
<?php if ($subValue && isset($subValue->value)) : ?>
|
||||
<?php $subValue->value = (\is_object($subValue->value) || \is_array($subValue->value)) ? \json_encode($subValue->value, \JSON_UNESCAPED_UNICODE) : $subValue->value; ?>
|
||||
<tr>
|
||||
<th scope="row"><em> <?php echo $subValue->label; ?></em></th>
|
||||
<td><?php echo $subValue->value; ?></td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
<?php endforeach; ?>
|
||||
<?php else : ?>
|
||||
<tr>
|
||||
<th scope="row"><?php echo $value->label; ?></th>
|
||||
<td><?php echo $value->value; ?></td>
|
||||
</tr>
|
||||
<?php endif; ?>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
Reference in New Issue
Block a user