merge with original branch

Author: shamsbd71

CHANGELOG.md

@@ -1,3 +1,15 @@
+<h2>Version: 2.6.7 (06/09/2017)</h2>
+<h3>Fix bugs</h3>
+- T3 Module Layout Problems with Joomla 3.7.3 | <a href="https://github.com/t3framework/t3/commit/463cfa53691493251c15964af6f561777c7a12db">Link</a><br/>
+- Remove auto switch tab | <a 
+href="https://github.com/t3framework/t3/commit/876c564f891ebde3e4a00367382a5a20290762c0">Link</a><br/>
+- Create a menu type List contacts in a category to see the error | <a href="https://github.com/t3framework/t3/commit/fe92584bd909a915e9dba1a8846aa4a7238032f5">Link</a><br/>
+- Fix anchor error on mobile | <a href="https://github.com/t3framework/t3/commit/03d0be479ccfaac0b736e6de0be09a803a11d61c">Link</a><br/>
+- Got error when enable JS Compress Tool: Closure Compiler | <a href="https://github.com/t3framework/t3/commit/0332111ea17ecd7bcf8bf740dcfa519aaf279ac7">Link</a><br/>
+- Fix null date comparison | <a href="https://github.com/t3framework/t3/commit/01807fb80c38446bf4a1ea8230d728fed5511636">Link</a><br/>
+- Missing Field tab on the article editting page | <a href="https://github.com/t3framework/t3/commit/7012672c66deed5239f86d13c177117d4b2f41c7">Link</a><br/>
+- Improve style for custom field edit | <a href="https://github.com/t3framework/t3/commit/cfea53dc9554094e30b165bc614bfaba33f6a31d">Link</a><br/>
+
 <h2>Version: 2.6.6 (21/07/2017)</h2>
 <h3>Fix bugs</h3>
 - Got notice error in thememagic | <a href="https://github.com/t3framework/t3/commit/e1bf82506fa8a4ce3930fff537891775261728f8">Link</a><br/>

README.md

@@ -45,7 +45,7 @@ Have a bug or a feature request? Feel free to open an issue via this link https:
 Contribution & Developer Network
 ----------
 With a desire to provide an unified responsive framework for the Joomla 3.x, we are looking forward to the contribution the collaboration from all 
-Joomla developers. Feel free to post your comment and or question to our [T3v3 forum at JoomlArt] (http://www.joomlart.com/forums/forumdisplay.php?411-JA-T3V3-Framework "Add a question/comment"), we have a plan to open a Google Group when we have enough developers using this framework.
+Joomla developers. Feel free to post your comment and or question to our [T3v3 forum at JoomlArt](https://www.joomlart.com/forums/forum/joomlart-public-forums/t3-framework/ "Add a question/comment"), we have a plan to open a Google Group when we have enough developers using this framework.
 
 Developer Network Update
 ----------

pkg_t3.xml

@@ -2,9 +2,9 @@
 <extension type="package" version="2.5" method="upgrade">
     <name>T3 Framework Package</name>
     <packagename>t3</packagename>
-    <version>2.6.6</version>
+    <version>2.6.7</version>
     <url>http://www.t3-framework.org</url>
-    <creationDate>July 21, 2017</creationDate>
+    <creationDate>Sep 06, 2017</creationDate>
     <copyright>(C) 2012 - 2017. All rights reserved.</copyright>
     <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
     <authorEmail>[email protected]</authorEmail>

source/plg_system_t3/admin/css/admin.css

@@ -1587,6 +1587,10 @@ button.btn-primary:active {
   border-radius: 0;
 }
 
+#tpl_positions_list_chzn {
+  margin-bottom: 10px;
+}
+
 
 /* -------------------------------------------------
 /* Responsive

source/plg_system_t3/admin/js/admin.js

@@ -720,7 +720,7 @@ var T3Admin = window.T3Admin || {};
 		T3Admin.initChangeStyle();
 		T3Admin.initT3ThemeExtras();
 		//T3Admin.initCheckupdate();
-		T3Admin.switchTab();
+		//T3Admin.switchTab();
 		T3Admin.fixValidate();
         T3Admin.noticeChange ();
 	});

source/plg_system_t3/admin/layout/js/layout.js

@@ -135,7 +135,8 @@ T3AdminLayout = window.T3AdminLayout || {};
 				var curspan = T3AdminLayout.curspan;
 
 				if(curspan){
-					$(curspan).parent().removeClass('pos-off pos-active').find('h3').html(this.value || T3Admin.langs.emptyLayoutPosition);
+					$optgroup = $(this).find('option:selected').parent().attr('label');
+					$(curspan).parent().removeClass('pos-off pos-active').find('h3').html(this.value || T3Admin.langs.emptyLayoutPosition).parent().attr('data-optgroup', $optgroup);
 					$(this).closest('.popover').hide();
 
 					var jspl = $(curspan).parent().parent().parent();
@@ -477,11 +478,13 @@ T3AdminLayout = window.T3AdminLayout || {};
 			jblocks.not(jspls).not(jsplblocks).not('.t3-admin-layout-uneditable').each(function(){
 				var name = $(this).attr('data-original'),
 					val = $(this).find('.t3-admin-layout-posname').html(),
+					optgroup = $(this).attr('data-optgroup'),
 					vis = $(this).closest('[data-vis]').data('data-vis'),
 					others = $(this).closest('[data-others]').data('data-others'),
 					info = T3AdminLayout.t3emptydv();
 
 				info.position = val ? val : '';
+				info.optgroup = optgroup ? optgroup : '';
 
 				if(vis){
 					vis = T3AdminLayout.t3visible(0, vis.vals);
@@ -506,13 +509,15 @@ T3AdminLayout = window.T3AdminLayout || {};
 					var jpos = $(this),
 						//pname = jpos.find('.t3-admin-layout-pos').attr('data-original'),
 						val = jpos.find('.t3-admin-layout-posname').html(),
+						optgroup = jpos.find('.t3-admin-layout-pos').attr('data-optgroup'),
 						info = T3AdminLayout.t3emptydv(),
 						width = T3AdminLayout.t3getwidth(idx, widths),
 						visible = T3AdminLayout.t3visible(idx, vis.vals),
 						first = T3AdminLayout.t3first(idx, firsts),
 						other = T3AdminLayout.t3others(idx, others);
 
 					info.position = val ? val : '';
+					info.optgroup = optgroup ? optgroup : '';
 
 					T3AdminLayout.t3formatwidth(info, width);
 					T3AdminLayout.t3formatvisible(info, visible);
@@ -1331,13 +1336,22 @@ T3AdminLayout = window.T3AdminLayout || {};
 								top = offs.top - jselect.outerHeight(true);
 								left = offs.left + (jspan.width() - jselect.width()) / 2;
 							}
-
+							var $optgroup = $(this).parent().attr('data-optgroup');
 							jselect.css({
 								top: top,
 								left: left
 							}).show()
 								.find('select')
 								.val(jspan.siblings('h3').html())
+								.trigger('liszt:updated')
+								.find('option').each(function(){
+									if ($(this).val() == jspan.siblings('h3').html() && $(this).parent().attr('label') == $optgroup) {
+										$(this).parents('select').val('');
+										$(this).attr('selected', true);
+									}
+								})
+								.parents('select')
+								.trigger('liszt:updated')
 								.next('.t3-admin-layout-rmvbtn').toggleClass('disabled', !jallpos.val())
 								.next('.t3-admin-layout-defbtn').toggleClass('disabled', jspan.siblings('h3').html() == jspan.closest('[data-original]').attr('data-original'));
 

source/plg_system_t3/base-bs3/html/com_contact/category/default.php

@@ -3,42 +3,11 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
-?>
-<div class="contact-category<?php echo $this->pageclass_sfx;?>">
-<?php if ($this->params->get('show_page_heading')) : ?>
-<h1>
-	<?php echo $this->escape($this->params->get('page_heading')); ?>
-</h1>
-<?php endif; ?>
-<?php if($this->params->get('show_category_title', 1)) : ?>
-<h2>
-	<?php echo JHtml::_('content.prepare', $this->category->title, '', 'com_contact.category'); ?>
-</h2>
-<?php endif; ?>
-<?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
-	<div class="category-desc">
-	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
-		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
-	<?php endif; ?>
-	<?php if ($this->params->get('show_description') && $this->category->description) : ?>
-		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_contact.category'); ?>
-	<?php endif; ?>
-	<div class="clr"></div>
-	</div>
-<?php endif; ?>
-
-<?php echo $this->loadTemplate('items'); ?>
-
-<?php if (!empty($this->children[$this->category->id])&& $this->maxLevel != 0) : ?>
-<div class="cat-children">
-	<h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
-	<?php echo $this->loadTemplate('children'); ?>
-</div>
-<?php endif; ?>
-</div>
+$this->subtemplatename = 'items';
+echo JLayoutHelper::render('joomla.content.category_default', $this);

source/plg_system_t3/base-bs3/html/com_contact/category/default_children.php

@@ -3,31 +3,31 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 $class = ' class="first"';
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) :
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
 ?>
-<ul class="list-striped list-condensed list-unstyled">
-	<?php foreach($this->children[$this->category->id] as $id => $child) : ?>
-		<?php
-		if($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
-		if(!isset($this->children[$this->category->id][$id + 1]))
+<ul class="list-striped list-condensed">
+<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+	<?php
+	if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
+		if (!isset($this->children[$this->category->id][$id + 1]))
 		{
 			$class = ' class="last"';
 		}
-		?>
-		<li<?php echo $class; ?>>
-			<?php $class = ''; ?>
+	?>
+	<li<?php echo $class; ?>>
+		<?php $class = ''; ?>
 			<h4 class="item-title">
 				<a href="<?php echo JRoute::_(ContactHelperRoute::getCategoryRoute($child->id)); ?>">
 				<?php echo $this->escape($child->title); ?>
 				</a>
 
-				<?php if ($this->params->get('show_cat_items') == 1) :?>
+				<?php if ($this->params->get('show_cat_items') == 1) : ?>
 					<span class="badge badge-info pull-right" title="<?php echo JText::_('COM_CONTACT_CAT_NUM'); ?>"><?php echo $child->numitems; ?></span>
 				<?php endif; ?>
 			</h4>
@@ -48,8 +48,8 @@
 				$this->category = $child->getParent();
 				$this->maxLevel++;
 			endif; ?>
-		</li>
-		<?php endif; ?>
-	<?php endforeach; ?>
+	</li>
+	<?php endif; ?>
+<?php endforeach; ?>
 </ul>
 <?php endif; ?>