3.5.2 release.

Fabrik · Jan 19, 2017 · 0f4d071 · 0f4d071
1 parent 31afdf5
commit 0f4d071
Show file tree

Hide file tree

Showing 346 changed files with 334 additions and 17,297 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -288,6 +288,11 @@ var refreshFiles = function () {
 
     fs.copySync('administrator/components/com_fabrik/', './fabrik_build/output/component/admin', {
         'filter': function (f) {
+            //console.log('admin file: ' + f);
+            if (f.indexOf('\\com_fabrik\\update\\') !== -1) {
+                console.log('*********' + f);
+                return false;
+            }
             return f.indexOf('.zip') === -1;
         }
     });
@@ -313,18 +318,18 @@ var refreshFiles = function () {
 
     console.log('copying list templates');
     // explicitly include list 2.5 templates
-    fs.mkdirsSync('./fabrik_build/output/component/site/views/list/tmpl25');
-    fs.copySync('./components/com_fabrik/views/list/tmpl25/default.xml',
-        './fabrik_build/output/component/site/views/list/tmpl25/default.xml');
-    fs.copySync('./components/com_fabrik/views/list/tmpl25/_advancedsearch.php',
-        './fabrik_build/output/component/site/views/list/tmpl25/_advancedsearch.php');
-    var tmpls = ['admin', 'adminmodule', 'bluesky', 'default', 'div'];
-    for (var i = 0; i < tmpls.length; i++) {
-        tmpl = tmpls[i];
-        fs.mkdirsSync('./fabrik_build/output/component/site/views/list/tmpl25/' + tmpl);
-        fs.copySync('./components/com_fabrik/views/list/tmpl25/' + tmpl,
-            './fabrik_build/output/component/site/views/list/tmpl25/' + tmpl);
-    }
+    //fs.mkdirsSync('./fabrik_build/output/component/site/views/list/tmpl25');
+    //fs.copySync('./components/com_fabrik/views/list/tmpl25/default.xml',
+    //    './fabrik_build/output/component/site/views/list/tmpl25/default.xml');
+    //fs.copySync('./components/com_fabrik/views/list/tmpl25/_advancedsearch.php',
+    //    './fabrik_build/output/component/site/views/list/tmpl25/_advancedsearch.php');
+    //var tmpls = ['admin', 'adminmodule', 'bluesky', 'default', 'div'];
+    //for (var i = 0; i < tmpls.length; i++) {
+    //    tmpl = tmpls[i];
+    //    fs.mkdirsSync('./fabrik_build/output/component/site/views/list/tmpl25/' + tmpl);
+    //    fs.copySync('./components/com_fabrik/views/list/tmpl25/' + tmpl,
+    //        './fabrik_build/output/component/site/views/list/tmpl25/' + tmpl);
+    //}
 
     // explicitly include 3.0 list templates
     fs.mkdirsSync('./fabrik_build/output/component/site/views/list/tmpl');
@@ -342,6 +347,7 @@ var refreshFiles = function () {
 
     console.log('copying form templates');
     // explicitly include 2.5 form templates
+    /*
     fs.mkdirsSync('./fabrik_build/output/component/site/views/form/tmpl25');
     fs.copySync('./components/com_fabrik/views/form/tmpl25/default.xml',
         './fabrik_build/output/component/site/views/form/tmpl25/default.xml');
@@ -361,6 +367,7 @@ var refreshFiles = function () {
                 }
             });
     }
+    */
 
     // explicitly include 3.0 form templates
     fs.mkdirsSync('./fabrik_build/output/component/site/views/form/tmpl');
@@ -415,25 +422,44 @@ var  library = function (version, grunt) {
 
 var component = function (version, grunt) {
     // Need to move the package.xml file out of the component to avoid nasties
-    fs.move('./fabrik_build/output/component/admin/fabrik.xml',
-        './fabrik_build/output/component/fabrik.xml', function () {
-            fs.move('./fabrik_build/output/admin/com_fabrik.manifest.class.php',
-                './fabrik_build/output/component/com_fabrik.manifest.class.php', function () {
-                    fs.move('./fabrik_build/output/component/admin/com_fabrik.manifest.class.php',
-                        './fabrik_build/output/component/com_fabrik.manifest.class.php', function () {
-                            fs.move('./fabrik_build/output/component/admin/pkg_fabrik.xml',
-                                './fabrik_build/output/pkg_fabrik/pkg_fabrik.xml', function () {
-                                    fs.move('./fabrik_build/output/component/admin/pkg_fabrik_sink.xml',
-                                        './fabrik_build/output/pkg_fabrik_sink/pkg_fabrik_sink.xml', function () {
-                                            zipPromises.push(zipPlugin('fabrik_build/output/component/',
-                                                'fabrik_build/output/pkg_fabrik_sink/packages/com_fabrik_' + version + '.zip'));
+    fs.move(
+        './fabrik_build/output/component/admin/fabrik.xml',
+        './fabrik_build/output/component/fabrik.xml',
+        function () {
+            fs.move(
+                './fabrik_build/output/admin/com_fabrik.manifest.class.php',
+                './fabrik_build/output/component/com_fabrik.manifest.class.php',
+                function () {
+                    fs.move('' +
+                        './fabrik_build/output/component/admin/com_fabrik.manifest.class.php',
+                        './fabrik_build/output/component/com_fabrik.manifest.class.php',
+                        function () {
+                            fs.move(
+                                './fabrik_build/output/component/admin/pkg_fabrik.xml',
+                                './fabrik_build/output/pkg_fabrik/pkg_fabrik.xml',
+                                function () {
+                                    fs.move(
+                                        './fabrik_build/output/component/admin/pkg_fabrik_sink.xml',
+                                        './fabrik_build/output/pkg_fabrik_sink/pkg_fabrik_sink.xml',
+                                        function () {
+                                            zipPromises.push(
+                                                zipPlugin(
+                                                    'fabrik_build/output/component/',
+                                                    'fabrik_build/output/pkg_fabrik_sink/packages/com_fabrik_' + version + '.zip'
+                                                )
+                                            );
                                             //library(version, grunt)
-;                                            packages(version, grunt);
-                                        });
-                                });
-                        });
-                });
-        });
+;                                           packages(version, grunt);
+                                        }
+                                    );
+                                }
+                            );
+                        }
+                    );
+                }
+            );
+        }
+    );
 };
 
 var packages = function (version, grunt) {

diff --git a/administrator/components/com_fabrik/com_fabrik.manifest.class.php b/administrator/components/com_fabrik/com_fabrik.manifest.class.php
@@ -187,11 +187,6 @@ protected function moveFiles(&$installer, $upgrade = false)
 			}
 		}
 
-		if (JFile::exists(JPATH_ROOT . '/administrator/components/com_fabrik/header.php'))
-		{
-			JFile::delete(JPATH_ROOT . '/administrator/components/com_fabrik/header.php');
-		}
-
 		return true;
 	}
 

diff --git a/administrator/components/com_fabrik/fabrik.xml b/administrator/components/com_fabrik/fabrik.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <extension client="site" method="upgrade" type="component" version="3">
 	<name>com_fabrik</name>
-	<creationDate>December 2016</creationDate>
+	<creationDate>January 2017</creationDate>
 	<author>Media A-Team, Inc.</author>
-	<copyright>Copyright (C) 2005-2016 Media A-Team, Inc. - All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005-2017 Media A-Team, Inc. - All rights reserved.</copyright>
 	<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.pollen-8.co.uk</authorUrl>
@@ -92,6 +92,7 @@
 			<file>access.xml</file>
 			<file>config.xml</file>
 			<file>controller.php</file>
+			<file>header.php</file>
 			<file>headings.css</file>
 			<file>index.html</file>
 		</files>

diff --git a/administrator/components/com_fabrik/pkg_fabrik.xml b/administrator/components/com_fabrik/pkg_fabrik.xml
@@ -4,8 +4,8 @@
 	<packagename>fabrik</packagename>
 	<version>3.5.2</version>
 	<url>http://www.fabrikar.com</url>
-	<creationDate>December 2016</creationDate>
-	<copyright>Copyright (C) 2005-2016 Media A-Team, Inc. - All rights reserved.</copyright>
+	<creationDate>January 2017</creationDate>
+	<copyright>Copyright (C) 2005-2017 Media A-Team, Inc. - All rights reserved.</copyright>
 	<author>Media A-Team, Inc.</author>
 	<packager>Rob Clayburn</packager>
 	<packagerurl>http://www.fabrikar.com</packagerurl>

diff --git a/administrator/components/com_fabrik/pkg_fabrik_sink.xml b/administrator/components/com_fabrik/pkg_fabrik_sink.xml
@@ -6,8 +6,8 @@
 	<url>http://www.joomla.org</url>
 	<packager>Rob Clayburn</packager>
 	<packagerurl>http://www.fabrikar.com</packagerurl>
-	<creationDate>December 2016</creationDate>
-	<copyright>Copyright (C) 2005-2016 Media A-Team, Inc. - All rights reserved.</copyright>
+	<creationDate>January 2017</creationDate>
+	<copyright>Copyright (C) 2005-2017 Media A-Team, Inc. - All rights reserved.</copyright>
 	<description>Fabrik Free Package</description>
 	<update>http://fabrikar.com/update/packages/free</update>
 	<files folder="packages">

diff --git a/administrator/modules/mod_fabrik_form/mod_fabrik_form.xml b/administrator/modules/mod_fabrik_form/mod_fabrik_form.xml
@@ -2,8 +2,8 @@
 <extension client="administrator" method="upgrade" type="module" version="3">
 	<name>mod_fabrik_form</name>
 	<author>Media A-Team, Inc.</author>
-	<creationDate>December 2016</creationDate>
-	<copyright>Copyright (C) 2005-2016 Media A-Team, Inc. - All rights reserved.</copyright>
+	<creationDate>January 2017</creationDate>
+	<copyright>Copyright (C) 2005-2017 Media A-Team, Inc. - All rights reserved.</copyright>
 	<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.fabrikar.com</authorUrl>

diff --git a/administrator/modules/mod_fabrik_list/mod_fabrik_list.xml b/administrator/modules/mod_fabrik_list/mod_fabrik_list.xml
@@ -2,8 +2,8 @@
 <extension client="administrator" method="upgrade" type="module" version="3">
 	<name>mod_fabrik_list</name>
 	<author>Media A-Team, Inc.</author>
-	<creationDate>December 2016</creationDate>
-	<copyright>Copyright (C) 2005-2016 Media A-Team, Inc. - All rights reserved.</copyright>
+	<creationDate>January 2017</creationDate>
+	<copyright>Copyright (C) 2005-2017 Media A-Team, Inc. - All rights reserved.</copyright>
 	<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.fabrikar.com</authorUrl>

diff --git a/administrator/modules/mod_fabrik_quickicon/mod_fabrik_quickicon.xml b/administrator/modules/mod_fabrik_quickicon/mod_fabrik_quickicon.xml
@@ -2,8 +2,8 @@
 <extension client="administrator" method="upgrade" type="module" version="3">
 	<name>mod_fabrik_quickicon</name>
 	<author>Media A-Team, Inc.</author>
-	<creationDate>December 2016</creationDate>
-	<copyright>Copyright (C) 2005-2016 Media A-Team, Inc. - All rights reserved.</copyright>
+	<creationDate>January 2017</creationDate>
+	<copyright>Copyright (C) 2005-2017 Media A-Team, Inc. - All rights reserved.</copyright>
 	<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.fabrikar.com</authorUrl>

diff --git a/administrator/modules/mod_fabrik_visualization/mod_fabrik_visualization.xml b/administrator/modules/mod_fabrik_visualization/mod_fabrik_visualization.xml
@@ -2,8 +2,8 @@
 <extension client="administrator" method="upgrade" type="module" version="3">
 	<name>Fabrik Visualization</name>
 	<author>Media A-Team, Inc.</author>
-	<creationDate>December 2016</creationDate>
-	<copyright>Copyright (C) 2005-2016 Media A-Team, Inc. - All rights reserved.</copyright>
+	<creationDate>January 2017</creationDate>
+	<copyright>Copyright (C) 2005-2017 Media A-Team, Inc. - All rights reserved.</copyright>
 	<license>GNU/GPL http://www.gnu.org/copyleft/gpl.html</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.fabrikar.com</authorUrl>

diff --git a/components/com_fabrik/views/details/tmpl25/admin/default.php b/components/com_fabrik/views/details/tmpl25/admin/default.php
diff --git a/components/com_fabrik/views/details/tmpl25/admin/default_group.php b/components/com_fabrik/views/details/tmpl25/admin/default_group.php
diff --git a/components/com_fabrik/views/details/tmpl25/admin/default_relateddata.php b/components/com_fabrik/views/details/tmpl25/admin/default_relateddata.php
diff --git a/components/com_fabrik/views/details/tmpl25/admin/images/add.png b/components/com_fabrik/views/details/tmpl25/admin/images/add.png
diff --git a/components/com_fabrik/views/details/tmpl25/admin/images/del.png b/components/com_fabrik/views/details/tmpl25/admin/images/del.png