Merge pull request #1 from RhymeDigital/develop

Merge latest develop branch
hb-agency · Apr 16, 2015 · 5add814 · 5add814
2 parents 0d579c2 + 72e2dc8
commit 5add814
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 520 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/composer.json b/composer.json
@@ -0,0 +1,45 @@
+{
+    "name": "rhymedigital/isotope_quickproducts",
+    "description": "A Contao CMS extension that allows you to place a list of Isotope products as a Content Element.",
+    "keywords": [
+    	"contao", 
+    	"isotope"
+    ],
+    "type": "contao-module",
+    "license": "LGPL-3.0+",
+    "authors": [
+        {
+            "name": "Rhyme Digital",
+            "homepage": "http://rhyme.digital"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.2",
+        "contao/core": ">=3.3.0,<4.0.0-dev",
+        "contao-community-alliance/composer-installer": "*",
+        "isotope/isotope-core": ">=1.0.1",
+        "terminal42/contao-namespace-class-loader" : "~ 1.0"
+    },
+    "autoload": {
+        "psr-0": {
+            "Rhyme\\": [
+                "library/"
+            ]
+        }
+    },
+    "extra": {
+        "contao": {
+            "sources": {
+                "": "system/modules/isotope_quickproducts"
+            }
+        }
+    },
+    "replace": {
+        "hb-agency/contao_zurb_foundation":"self.version"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "config": {
+        "preferred-install": "dist"
+    }
+}
diff --git a/config/autoload.php b/config/autoload.php
@@ -3,18 +3,18 @@
 /**
  * Quick Product Content Element for Isotope eCommerce and Contao Open Source CMS
  *
- * Copyright (C) 2014 HB Agency
+ * Copyright (C) 2015 Rhyme.Digital
  *
  * @package    Isotope_Quickproducts
- * @link       http://www.hbagency.com
+ * @link       http://rhyme.digital
  * @license    http://opensource.org/licenses/lgpl-3.0.html
  */
 
 
 /**
  * Register PSR-0 namespace
  */
-NamespaceClassLoader::add('HBAgency', 'system/modules/isotope_quickproducts/library');
+NamespaceClassLoader::add('Rhyme', 'system/modules/isotope_quickproducts/library');
 
 
 /**

diff --git a/config/config.php b/config/config.php
@@ -3,10 +3,10 @@
 /**
  * Quick Product Content Element for Isotope eCommerce and Contao Open Source CMS
  *
- * Copyright (C) 2014 HB Agency
+ * Copyright (C) 2015 Rhyme.Digital
  *
  * @package    Isotope_Quickproducts
- * @link       http://www.hbagency.com
+ * @link       http://rhyme.digital
  * @license    http://opensource.org/licenses/lgpl-3.0.html
  */
 
@@ -16,5 +16,5 @@
  */
 array_insert($GLOBALS['TL_CTE']['isotope'], 1, array
 (
-	'isotope_quick' => 'HBAgency\ContentElement\QuickProducts'
+	'isotope_quick' => 'Rhyme\ContentElement\QuickProducts'
 ));  
diff --git a/dca/tl_content.php b/dca/tl_content.php
@@ -3,17 +3,20 @@
 /**
  * Quick Product Content Element for Isotope eCommerce and Contao Open Source CMS
  *
- * Copyright (C) 2014 HB Agency
+ * Copyright (C) 2015 Rhyme.Digital
  *
  * @package    Isotope_Quickproducts
- * @link       http://www.hbagency.com
+ * @link       http://rhyme.digital
  * @license    http://opensource.org/licenses/lgpl-3.0.html
  */
 
+\Controller::loadDataContainer('tl_module');
+\Controller::loadLanguageFile('tl_module');
+
 /**
  * Palettes
  */
-$GLOBALS['TL_DCA']['tl_content']['palettes']['isotope_quick'] = '{type_legend},type,headline;{include_legend},iso_products;{config_legend},iso_listingSortField,iso_listingSortDirection,iso_cols,iso_use_quantity,iso_buttons;{template_settings},iso_gallery,iso_list_layout;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space;{invisible_legend:hide},invisible,start,stop';
+$GLOBALS['TL_DCA']['tl_content']['palettes']['isotope_quick'] = '{type_legend},type,headline;{include_legend},iso_products;{config_legend},iso_listingSortField,iso_listingSortDirection,iso_cols,iso_use_quantity,iso_buttons,iso_addProductJumpTo;{template_settings},iso_gallery,iso_list_layout;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space;{invisible_legend:hide},invisible,start,stop';
 
 
 /**
@@ -125,4 +128,4 @@
     'relation'                  => array('type'=>'hasOne', 'load'=>'lazy'),
 );
 
-
+$GLOBALS['TL_DCA']['tl_content']['fields']['iso_addProductJumpTo'] = $GLOBALS['TL_DCA']['tl_module']['fields']['iso_addProductJumpTo'];
diff --git a/languages/en/default.php b/languages/en/default.php
@@ -3,10 +3,10 @@
 /**
  * Quick Product Content Element for Isotope eCommerce and Contao Open Source CMS
  *
- * Copyright (C) 2014 HB Agency
+ * Copyright (C) 2015 Rhyme.Digital
  *
  * @package    Isotope_Quickproducts
- * @link       http://www.hbagency.com
+ * @link       http://rhyme.digital
  * @license    http://opensource.org/licenses/lgpl-3.0.html
  */
 

diff --git a/languages/en/tl_content.php b/languages/en/tl_content.php
@@ -3,10 +3,10 @@
 /**
  * Quick Product Content Element for Isotope eCommerce and Contao Open Source CMS
  *
- * Copyright (C) 2014 HB Agency
+ * Copyright (C) 2015 Rhyme.Digital
  *
  * @package    Isotope_Quickproducts
- * @link       http://www.hbagency.com
+ * @link       http://rhyme.digital
  * @license    http://opensource.org/licenses/lgpl-3.0.html
  */
 

diff --git a/...HBAgency/ContentElement/QuickProducts.php → ...ry/Rhyme/ContentElement/QuickProducts.php b/...HBAgency/ContentElement/QuickProducts.php → ...ry/Rhyme/ContentElement/QuickProducts.php
@@ -3,18 +3,18 @@
 /**
  * Quick Product Content Element for Isotope eCommerce and Contao Open Source CMS
  *
- * Copyright (C) 2014 HB Agency
+ * Copyright (C) 2015 Rhyme.Digital
  *
  * @package    Isotope_Quickproducts
- * @link       http://www.hbagency.com
+ * @link       http://rhyme.digital
  * @license    http://opensource.org/licenses/lgpl-3.0.html
  */
 
 
 /**
  * Run in a custom namespace, so the class can be replaced
  */
-namespace HBAgency\ContentElement;
+namespace Rhyme\ContentElement;
 
 use Isotope\ContentElement\ContentElement as Iso_Element;
 use Haste\Haste;
@@ -28,9 +28,9 @@
  * Class QuickProducts
  *
  * Provide methods to display Isotope products as content elements.
- * @copyright  HB Agency 2014
- * @author     Blair Winans <bwinans@hbagency.com>
- * @author     Adam Fisher <afisher@hbagency.com>
+ * @copyright  Rhyme.Digital 2015
+ * @author     Blair Winans <blair@rhyme.digital>
+ * @author     Adam Fisher <adam@rhyme.digital>
  */
 class QuickProducts extends Iso_Element
 {