Merge branch 'staging' into fix-route-link-ssl

joomla · Apr 27, 2019 · 3194253 · 3194253
2 parents 05226d3 + 94a068f
commit 3194253
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/administrator/components/com_templates/models/template.php b/administrator/components/com_templates/models/template.php
@@ -330,8 +330,8 @@ protected function fixTemplateName()
 
 		foreach ($files as $file)
 		{
-			$newFile = str_replace($oldName, $newName, $file);
-			$result = JFile::move($file, $newFile) && $result;
+			$newFile = '/' . str_replace($oldName, $newName, basename($file));
+			$result  = JFile::move($file, dirname($file) . $newFile) && $result;
 		}
 
 		// Edit XML file

diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
@@ -9111,11 +9111,13 @@ input:focus,
 	column-gap: 15px;
 }
 #menu-assignment .menu-links > li {
+	display: inline-block;
 	vertical-align: top;
 	margin-bottom: 15px;
 	width: 100%;
 	list-style: none;
 	page-break-inside: avoid;
+	break-inside: avoid;
 }
 #menu-assignment .menu-links-block {
 	background-color: #fafafa;

diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
@@ -9111,11 +9111,13 @@ input:focus,
 	column-gap: 15px;
 }
 #menu-assignment .menu-links > li {
+	display: inline-block;
 	vertical-align: top;
 	margin-bottom: 15px;
 	width: 100%;
 	list-style: none;
 	page-break-inside: avoid;
+	break-inside: avoid;
 }
 #menu-assignment .menu-links-block {
 	background-color: #fafafa;

diff --git a/administrator/templates/isis/less/pages/_com_templates.less b/administrator/templates/isis/less/pages/_com_templates.less
@@ -12,11 +12,13 @@
 		-webkit-column-gap: 15px;
 		column-gap: 15px;
 		> li {
+			display: inline-block;
 			vertical-align: top;
 			margin-bottom: 15px;
 			width: 100%;
 			list-style: none;
 			page-break-inside: avoid;
+			break-inside: avoid;
 		}
 	}
 	.menu-links-block {

diff --git a/components/com_contact/views/category/tmpl/default.xml b/components/com_contact/views/category/tmpl/default.xml
@@ -327,6 +327,17 @@
 
 		<fieldset name="contact" label="COM_CONTACT_BASIC_OPTIONS_FIELDSET_LABEL"
 			addfieldpath="/administrator/components/com_fields/models/fields">
+
+			<field
+				name="contact_layout"
+				type="componentlayout"
+				label="JGLOBAL_FIELD_LAYOUT_LABEL"
+				description="JGLOBAL_FIELD_LAYOUT_DESC"
+				menuitems="true"
+				extension="com_contact"
+				view="contact"
+			/>
+
 			<field
 				name="presentation_style"
 				type="list"