[4.1] Template Override switches (#36366)

* [4.1] Template Override switches

For some reason the switches were not displayed in the same way as other similar switches. This leads to confusion (reported elsewhere) and the need for creating additional css.

This Pr resolves that. Made against 4.1 as there are language string removals and additions and I dont know what the policy is for that in j4.

### Before

### After

* filter boolean

* remove the filters. this is not a form that is saved

Author: brianteeman

administrator/components/com_templates/forms/source.xml

@@ -39,21 +39,23 @@
 		<field
 			name="show_core"
 			type="radio"
+			label="COM_TEMPLATES_LAYOUTS_DIFFVIEW_CORE"
 			layout="joomla.form.field.radio.switcher"
 			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"
 			type="radio"
+			label="COM_TEMPLATES_LAYOUTS_DIFFVIEW_DIFF"
 			layout="joomla.form.field.radio.switcher"
 			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>

administrator/components/com_templates/tmpl/template/default.php

@@ -79,8 +79,8 @@
 		<?php if ($this->type == 'file' && !empty($this->source->coreFile)) : ?>
 			<div class="col-md-4 text-end">
 				<div id="toggle-buttons">
-					<?php echo $this->form->getInput('show_core'); ?>
-					<?php echo $this->form->getInput('show_diff'); ?>
+					<?php echo $this->form->renderField('show_core'); ?>
+					<?php echo $this->form->renderField('show_diff'); ?>
 				</div>
 			</div>
 		<?php endif; ?>

administrator/language/en-GB/com_templates.ini

@@ -147,10 +147,8 @@ 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 Differences"
-COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE="Show Original"
-COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF="Show Differences"
+COM_TEMPLATES_LAYOUTS_DIFFVIEW_CORE="Original File"
+COM_TEMPLATES_LAYOUTS_DIFFVIEW_DIFF="Differences"
 COM_TEMPLATES_MANAGE_FOLDERS="Manage Folders"
 COM_TEMPLATES_MANAGER_ADD_STYLE="Templates: Add Style"
 COM_TEMPLATES_MANAGER_EDIT_STYLE="Templates: Edit Style"

build/media_source/com_templates/css/admin-templates-default.css

@@ -92,15 +92,6 @@
   background-color: #F0F0EE;
 }
 
-#jform_show_core {
-  display: inline;
-}
-
-#jform_show_diff {
-  display: inline;
-  margin-left: 3.5em;
-}
-
 .switcher-label-0, .switcher-label-1 {
   white-space: nowrap;
 }