Merge pull request #28 from Quantility/development

2.5.0dev

.travis.yml

@@ -1,7 +1,76 @@
+# Forces new Travis-CI Infrastructure
+sudo: false
+
 language: php
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-  - nightly
+
+env:
+  global:
+    - RUN_PHPCS="no"
+    - RUN_UNIT_TESTS="yes"
+    - RUN_JAVASCRIPT_TESTS="no"
+    - INSTALL_MEMCACHE="yes"
+    - INSTALL_MEMCACHED="yes"
+    - INSTALL_REDIS="yes"
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.6
+      env: RUN_PHPCS="yes" RUN_UNIT_TESTS="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no"
+    - php: 5.3
+      env: INSTALL_APC="yes"
+    - php: 5.4
+      env: INSTALL_APC="yes"
+    - php: 5.5
+      env: INSTALL_APCU="yes"
+    - php: 5.6
+      env: INSTALL_APCU="yes"
+    - php: 7.0
+      env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
+    - node_js: 6.1
+      sudo: true
+      env: RUN_JAVASCRIPT_TESTS="yes" RUN_UNIT_TESTS="no"
+    - php: 7.1
+      env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
+    - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        apt:
+          packages:
+            - mysql-server-5.6
+            - mysql-client-core-5.6
+            - mysql-client-5.6
+      services:
+        - mysql
+        - postgresql
+        - redis-server
+      env: INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" # Disabled items that currently do not work in travis-ci hhvm
+  allow_failures:
+    - php: 7.1
+    - php: hhvm
+    - node_js: 6.1
+
+services:
+  - memcache
+  - memcached
+  - redis-server
+
+before_script:
+  # JavaScript tests
+ # - if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then export DISPLAY=:99.0; bash build/travis/javascript-tests.sh $PWD; fi
+  # Make sure all dev dependencies are installed
+ # - if [[ ( $RUN_UNIT_TESTS == "yes" ) || ( $RUN_PHPCS == "yes" ) ]]; then bash build/travis/unit-tests.sh $PWD; fi
+
+script:
+ # - if [[ $RUN_PHPCS == "yes" ]]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
+ # - if [[ $RUN_UNIT_TESTS == "yes" ]]; then libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml; fi
+ # - if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then tests/javascript/node_modules/karma/bin/karma start karma.conf.js --single-run ; fi
+
+branches:
+  except:
+    - 2.5.x
+
+notifications:
+  email: false

files/favicon-app.php

@@ -12,16 +12,16 @@
  * forzare la URL in "Favicon Generator Options" con
  * "I cannot or I do not want to place favicon files at the root of my web site. Instead I will place them here"
  * e incollare URL 
- * scaricare il pacchetto e caricarlo in /templates/qhtm5/images/favicon
+ * scaricare il pacchetto e caricarlo in /templates/qhtml5/images/favicon
  */
 // no direct access
 defined( '_JEXEC' ) or die( 'Restricted access' );
 ?>
-<link rel="apple-touch-icon" sizes="180x180" href="/templates/qhtm5/images/favicon/apple-touch-icon.png">
-<link rel="icon" type="image/png" href="/templates/qhtm5/images/favicon/favicon-32x32.png" sizes="32x32">
-<link rel="icon" type="image/png" href="/templates/qhtm5/images/favicon/favicon-16x16.png" sizes="16x16">
-<link rel="manifest" href="/templates/qhtm5/images/favicon/manifest.json">
-<link rel="mask-icon" href="/templates/qhtm5/images/favicon/safari-pinned-tab.svg" color="#5bbad5">
-<link rel="shortcut icon" href="/templates/qhtm5/images/favicon/favicon.ico">
-<meta name="msapplication-config" content="/templates/qhtm5/images/favicon/browserconfig.xml">
+<link rel="apple-touch-icon" sizes="180x180" href="/templates/qhtml5/images/favicon/apple-touch-icon.png">
+<link rel="icon" type="image/png" href="/templates/qhtml5/images/favicon/favicon-32x32.png" sizes="32x32">
+<link rel="icon" type="image/png" href="/templates/qhtml5/images/favicon/favicon-16x16.png" sizes="16x16">
+<link rel="manifest" href="/templates/qhtml5/images/favicon/manifest.json">
+<link rel="mask-icon" href="/templates/qhtml5/images/favicon/safari-pinned-tab.svg" color="#5bbad5">
+<link rel="shortcut icon" href="/templates/qhtml5/images/favicon/favicon.ico">
+<meta name="msapplication-config" content="/templates/qhtml5/images/favicon/browserconfig.xml">
 <meta name="theme-color" content="#ffffff">

head.php

@@ -15,7 +15,7 @@
 	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')?> "/>
+	user-scalable=<?php echo $this->params->get('user-scalable')?>"/>
 <?php if($this->params->get('handheldfriendly') == 1) { ?>
 <meta name="HandheldFriendly" content="true" />
 <?php } ?>

templateDetails.xml

@@ -6,17 +6,19 @@
 	<author>Quantility</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>http://www.quantility.it</authorUrl>
-	<copyright>Copyright (C) 2016 Quantility.it, Inc. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2017 Quantility.it, Inc. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.2.3dev build 15/09/2016</version>
+	<version>2.5.ev build 24/01/2017</version>
 	<description>TPL_QHTML5_XML_DESCRIPTION</description>
 	<files>
-		<folder>html</folder>
 		<folder>css</folder>
-		<folder>js</folder>
-		<folder>images</folder>
 		<folder>files</folder>
+		<folder>html</folder>
+		<folder>images</folder>
+		<folder>js</folder>		
 		<folder>language</folder>
+		<filename>index.html</filename>
+		<filename>qhtml5.png</filename>
 		<filename>index.php</filename>
 		<filename>head.php</filename>
 		<filename>template.php</filename>