Skip to content

[4.0] Fix switch functionality for template overrides. #26359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilsonge merged 6 commits into from
Sep 24, 2019
Merged

[4.0] Fix switch functionality for template overrides. #26359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e8b4db
Fixed switch functionality for template overrides.
Harmageddon Sep 19, 2019
d118e72
Added labels to switchers in override view.
Harmageddon Sep 19, 2019
7802e5e
Merge branch '4.0-dev' into fix_tpl_override_diff
infograf768 Sep 20, 2019
052e568
Fixed switcher display for template overrides.
Harmageddon Sep 20, 2019
e6fd4be
Fixes for RTL languages.
Harmageddon Sep 20, 2019
09be866
Another RTL fix.
Harmageddon Sep 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions administrator/components/com_templates/forms/source.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,24 @@

<field
name="show_core"
label="COM_TEMPLATES_FIELD_SHOW_CORE"
type="radio"
class="switcher switcher-primary"
default="0"
>
<option value="0">COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE</option>
<option value="1">COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>

<field
name="show_diff"
label="COM_TEMPLATES_FIELD_SHOW_DIFF"
type="radio"
class="switcher switcher-primary"
default="0"
>
<option value="0">COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF</option>
<option value="1">COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF</option>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
</fieldset>
</form>
7 changes: 1 addition & 6 deletions administrator/components/com_templates/tmpl/template/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
use Joomla\CMS\Router\Route;
use Joomla\CMS\Session\Session;

Text::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE');
Text::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE');
Text::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF');
Text::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF');

HTMLHelper::_('script', 'vendor/diff/diff.min.js', array('version' => 'auto', 'relative' => true));
HTMLHelper::_('script', 'com_templates/admin-template-compare.min.js', array('version' => 'auto', 'relative' => true));
HTMLHelper::_('script', 'com_templates/admin-template-toggle-switch.min.js', array('version' => 'auto', 'relative' => true));
Expand Down Expand Up @@ -128,7 +123,7 @@
<?php if (!empty($this->source->coreFile)) : ?>
<?php $coreFileContent = file_get_contents($this->source->coreFile); ?>
<?php $overrideFileContent = file_get_contents($this->source->filePath); ?>
<div class="col-md-6" id="core-pane">
<div class="col-md-12" id="core-pane">
<h2><?php echo Text::_('COM_TEMPLATES_FILE_CORE_PANE'); ?></h2>
<div class="editor-border">
<?php echo $this->form->getInput('core'); ?>
Expand Down
6 changes: 2 additions & 4 deletions administrator/language/en-GB/en-GB.com_templates.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ COM_TEMPLATES_ERROR_WARNFILETYPE="File format not supported."
COM_TEMPLATES_ERROR_WARNIEXSS="Can't be uploaded. Has XSS."
COM_TEMPLATES_FIELD_CLIENT_LABEL="Location"
COM_TEMPLATES_FIELD_HOME_LABEL="Default"
COM_TEMPLATES_FIELD_SHOW_CORE="Original File"
COM_TEMPLATES_FIELD_SHOW_DIFF="Differences"
COM_TEMPLATES_FIELD_SOURCE_LABEL="Source Code"
COM_TEMPLATES_FIELD_TEMPLATE_LABEL="Template"
COM_TEMPLATES_FIELD_TITLE_LABEL="Style Name"
Expand Down Expand Up @@ -146,10 +148,6 @@ COM_TEMPLATES_IMAGE_WIDTH="Width"
COM_TEMPLATES_INVALID_FILE_NAME="Invalid file name. Please choose a file name with a-z, A-Z, 0-9, - and _."
COM_TEMPLATES_INVALID_FILE_TYPE="File type not selected."
COM_TEMPLATES_INVALID_FOLDER_NAME="Invalid folder name. Please choose a folder name with a-z, A-Z, 0-9, - and _."
COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE="Hide Original"
COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF="Hide Diff"
COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE="Show Original"
COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF="Show Diff"
COM_TEMPLATES_MANAGER_ADD_STYLE="Templates: Add Style"
COM_TEMPLATES_MANAGER_EDIT_STYLE="Templates: Edit Style"
COM_TEMPLATES_MANAGE_FOLDERS="Manage Folders"
Expand Down
80 changes: 29 additions & 51 deletions build/media_source/com_templates/js/admin-template-toggle-switch.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,15 @@
const showCoreChangedOff = () => {
const override = document.getElementById('override-pane');
const corePane = document.getElementById('core-pane');
const fieldset = override.parentElement.parentElement;

if (corePane && override) {
corePane.classList.remove('active');
override.className = 'col-md-12';

if (fieldset.classList.contains('options-grid-form-half')) {
fieldset.classList.remove('options-grid-form-half');
fieldset.classList.add('options-grid-form-full');
}

if (typeof Storage !== 'undefined') {
localStorage.removeItem('coreSwitchState');
Expand All @@ -46,10 +51,15 @@
const showCoreChangedOn = () => {
const override = document.getElementById('override-pane');
const corePane = document.getElementById('core-pane');
const fieldset = override.parentElement.parentElement;

if (corePane && override) {
corePane.classList.add('active');
override.className = 'col-md-6';

if (fieldset.classList.contains('options-grid-form-full')) {
fieldset.classList.remove('options-grid-form-full');
fieldset.classList.add('options-grid-form-half');
}

if (Joomla.editors.instances.jform_core) {
Joomla.editors.instances.jform_core.refresh();
Expand All @@ -62,63 +72,31 @@
};

document.addEventListener('DOMContentLoaded', () => {
const JformShowDiff = document.getElementById('jform_show_diff');
const JformShowCore = document.getElementById('jform_show_core');

if (JformShowDiff) {
JformShowDiff.addEventListener('joomla.switcher.on', showDiffChangedOn);
JformShowDiff.addEventListener('joomla.switcher.off', showDiffChangedOff);
const JformShowDiffOn = document.getElementById('jform_show_diff1');
const JformShowDiffOff = document.getElementById('jform_show_diff0');
const JformShowCoreOn = document.getElementById('jform_show_core1');
const JformShowCoreOff = document.getElementById('jform_show_core0');

if (JformShowDiffOn && JformShowDiffOff) {
JformShowDiffOn.addEventListener('click', showDiffChangedOn);
JformShowDiffOff.addEventListener('click', showDiffChangedOff);
}

if (JformShowCore) {
JformShowCore.addEventListener('joomla.switcher.on', showCoreChangedOn);
JformShowCore.addEventListener('joomla.switcher.off', showCoreChangedOff);
if (JformShowCoreOn && JformShowCoreOff) {
JformShowCoreOn.addEventListener('click', showCoreChangedOn);
JformShowCoreOff.addEventListener('click', showCoreChangedOff);
}

// Callback executed when JformShowCore was found
function handleJformShowCore() {
JformShowCore.newActive = 1;
JformShowCore.switch();
}

if (typeof Storage !== 'undefined' && localStorage.getItem('coreSwitchState') && JformShowCore) {
// Set up the mutation observer
const observerJformShowCore = new MutationObserver(((mutations, me) => {
if (JformShowDiff) {
handleJformShowCore();
me.disconnect();
}
}));

// Start observing
observerJformShowCore.observe(JformShowCore, {
childList: true,
subtree: true,
});
if (typeof Storage !== 'undefined' && localStorage.getItem('coreSwitchState') && JformShowCoreOn) {
JformShowCoreOn.checked = true;
JformShowCoreOff.checked = false;

showCoreChangedOn();
}

// Callback executed when JformShowDiff was found
function handleJformShowDiff() {
JformShowDiff.newActive = 1;
JformShowDiff.switch();
}

if (typeof Storage !== 'undefined' && localStorage.getItem('diffSwitchState') && JformShowDiff) {
// Set up the mutation observer
const observerJformShowDiff = new MutationObserver(((mutations, me) => {
if (JformShowDiff) {
handleJformShowDiff();
me.disconnect();
}
}));

// Start observing
observerJformShowDiff.observe(JformShowDiff, {
childList: true,
subtree: true,
});
if (typeof Storage !== 'undefined' && localStorage.getItem('diffSwitchState') && JformShowDiffOn) {
JformShowDiffOn.checked = true;
JformShowDiffOff.checked = false;

showDiffChangedOn();
}
Expand Down
32 changes: 30 additions & 2 deletions build/media_source/system/scss/fields/switcher.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ $switcher-height: 28px;
height: $switcher-height;
width: $switcher-width;
margin: 0;
left: 0;

[dir=rtl] & {
left: auto;
right: 0;
}
}

.switcher input:checked {
Expand All @@ -44,6 +50,15 @@ $switcher-height: 28px;
position: absolute;
transition: opacity 0.25s ease;
margin-bottom: 0;
left: 0;

[dir=rtl] & {
left: auto;
right: 0;
margin-left: 0;
margin-right: 70px;
text-align: right;
}
}

.switcher .toggle-outside {
Expand All @@ -55,6 +70,12 @@ $switcher-height: 28px;
width: 58px;
box-sizing: border-box;
border: 1px solid rgba(0,0,0,.18);
left: 0;

[dir=rtl] & {
left: auto;
right: 0;
}
}

.switcher input ~ input:checked ~ .toggle-outside{
Expand Down Expand Up @@ -82,10 +103,17 @@ $switcher-height: 28px;
padding-top: 5px;
padding-right: 5px;
text-align: left;

[dir=rtl] & {
padding-left: 5px;
padding-right: 0;
float: right;
text-align: right;
}
}

.col-md-9 .switcher__legend,
.col-md-12 .switcher__legend {
.col-md-9 .control-group .switcher__legend,
.col-md-12 .control-group .switcher__legend {
margin-left: -220px;

[dir=rtl] & {
Expand Down