Merge pull request #29 from Quantility/development

Release: 2.5.0dev
56klab · Feb 14, 2017 · 4a0a471 · 4a0a471
2 parents 34d1c58 + 036024a
commit 4a0a471
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,13 @@
-![Deployment status from DeployBot](https://quantility.deploybot.com/badge/02267418008817/45791.svg) ![Build Status](https://travis-ci.org/Quantility/qhtml5.svg)
-qhtml5
+![Deployment status from DeployBot](https://quantility.deploybot.com/badge/77558060029390/84717.svg)
+Qhtml5
 ======
 
-Template Joomla 3.x con Bootstrap e jQuery
+Basic Joomla 3.x Template
 
-Latest Release: 2.2.3dev 15/09/2016
+Latest Release: 2.5.0dev build 14/02/2017
+
+14/02/2017
+- Lots of improvements!
 
 15/09/2016
 - Big cleanup

diff --git a/component.php b/component.php
@@ -1 +1,38 @@
-<?php/** * @package      Qhtml5 * * @author       Quantility * @copyright    Copyright (C) 2015. All rights reserved. * @license      http://www.gnu.org/licenses/gpl.html GNU/GPL */defined('_JEXEC') or die;$app             = JFactory::getApplication();$doc             = JFactory::getDocument();$this->language  = $doc->language;$this->direction = $doc->direction;// Add JavaScript FrameworksJHtml::_('bootstrap.framework');// Add Stylesheets$doc->addStyleSheet('templates/' . $this->template . '/css/template.css');// Load optional rtl Bootstrap css and Bootstrap bugfixesJHtmlBootstrap::loadCss($includeMaincss = false, $this->direction);?><!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"><head><jdoc:include type="head" /><!--[if lt IE 9]>	<script src="<?php echo $this->baseurl; ?>/media/jui/js/html5.js"></script><![endif]--></head><body class="contentpane modal">	<jdoc:include type="message" />	<jdoc:include type="component" /></body></html>
+<?php
+/**
+ * @package      Qhtml5
+ *
+ * @author       Quantility
+ * @copyright    Copyright (C) 2017. All rights reserved.
+ * @license      http://www.gnu.org/licenses/gpl.html GNU/GPL
+ */
+defined('_JEXEC') or die;
+
+$app             = JFactory::getApplication();
+$doc             = JFactory::getDocument();
+$this->language  = $doc->language;
+$this->direction = $doc->direction;
+
+// Add JavaScript Frameworks
+JHtml::_('bootstrap.framework');
+
+// Add Stylesheets
+$doc->addStyleSheet('templates/' . $this->template . '/css/template.css');
+
+// Load optional rtl Bootstrap css and Bootstrap bugfixes
+JHtmlBootstrap::loadCss($includeMaincss = false, $this->direction);
+
+?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+<jdoc:include type="head" />
+<!--[if lt IE 9]>
+	<script src="<?php echo $this->baseurl; ?>/media/jui/js/html5.js"></script>
+<![endif]-->
+</head>
+<body class="contentpane modal">
+	<jdoc:include type="message" />
+	<jdoc:include type="component" />
+</body>
+</html>
diff --git a/files/microdata.php b/files/microdata.php
@@ -1 +1,15 @@
-<?php/** * @package      Qhtml5 * * @author       Quantility * @copyright    Copyright (C) 2015. All rights reserved. * @license      http://www.gnu.org/licenses/gpl.html GNU/GPL */?> <script type="application/ld+json">{  "@context": "http://schema.org",  "@type": "<?php echo $md_sitetype;?>"}</script>
+<?php
+/**
+ * @package      Qhtml5
+ *
+ * @author       Quantility
+ * @copyright    Copyright (C) 2017. All rights reserved.
+ * @license      http://www.gnu.org/licenses/gpl.html GNU/GPL
+ */
+?> 
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "<?php echo $md_sitetype;?>"
+}
+</script>
diff --git a/head.php b/head.php
@@ -10,19 +10,15 @@
 defined( '_JEXEC' ) or die( 'Restricted access' );
 ?>
 <?php header('X-UA-Compatible: IE=edge,chrome=1');?>
-<meta name="viewport" content="
-	width=device-width,
-	initial-scale=<?php echo $this->params->get('initial-scale')?>,
-	minimum-scale=<?php echo $this->params->get('minimum-scale')?>,
-	maximum-scale=<?php echo $this->params->get('maximum-scale')?>,
-	user-scalable=<?php echo $this->params->get('user-scalable')?>"/>
+<meta name="viewport" content="width=device-width,initial-scale=<?php echo $this->params->get('initial-scale')?>,minimum-scale=<?php echo $this->params->get('minimum-scale')?>,maximum-scale=<?php echo $this->params->get('maximum-scale')?>,user-scalable=<?php echo $this->params->get('user-scalable')?>"/>
 <?php if($this->params->get('handheldfriendly') == 1) { ?>
 <meta name="HandheldFriendly" content="true" />
 <?php } ?>
 <?php if($this->params->get('apple-app-fullscreen') == 1) { ?>
 <meta name="apple-mobile-web-app-capable" content="YES" />
 <?php } ?>
 <jdoc:include type="head" />
+<jdoc:include type="modules" name="head" style="raw" />
 <?php if($this->params->get('tpdebug') == 1): ?>
 <style>
 	* {border: 1px solid #f00;}