Fixes view cancel btn

_build/build.transport.php

@@ -28,13 +28,12 @@
 /* define package */
 define('PKG_NAME','Articles');
 define('PKG_NAME_LOWER',strtolower(PKG_NAME));
-define('PKG_VERSION','1.7.2');
+define('PKG_VERSION','1.7.9');
 define('PKG_RELEASE','pl');
 
 /* define sources */
 $root = dirname(dirname(__FILE__)).'/';
 $sources = array(
-    'root' => $root,
     'root' => $root,
     'build' => $root .'_build/',
     'resolvers' => $root . '_build/resolvers/',
@@ -234,4 +233,4 @@
 
 $modx->log(modX::LOG_LEVEL_INFO,"\n<br />Package Built.<br />\nExecution time: {$totalTime}\n");
 
-exit ();
+exit ();

_build/config.json

@@ -3,7 +3,7 @@
     ,"lowCaseName": "articles"
     ,"description": ""
     ,"author": "Shaun McCormick"
-    ,"version": "1.7.2"
+    ,"version": "1.7.9"
     ,"package":{
         "elements": {
             "plugins": [{

_build/data/transport.subpackages.php

@@ -30,7 +30,7 @@
 $subpackages = array(
     'archivist'      => 'archivist-1.2.4-pl',
     'getpage'        => 'getpage-1.2.3-pl',
-    'getresources'   => 'getresources-1.6.0-pl',
+    'getresources'   => 'getresources-1.6.1-pl',
     'quip'           => 'quip-2.3.3-pl',
     'taglister'      => 'taglister-1.1.7-pl',
 );

_build/resolvers/packages/resolve.getresources.php

@@ -9,7 +9,7 @@
  */
 $success= true;
 if ($transport && $transport->xpdo) {
-    $signature = 'getresources-1.6.0-pl';
+    $signature = 'getresources-1.6.1-pl';
     $modx =& $transport->xpdo;
     $modx->addPackage('modx.transport',$modx->getOption('core_path').'model/');
 

assets/components/articles/js/article/create.js

@@ -126,6 +126,7 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
             ,height: 400
             ,grow: false
             ,value: (config.record.content || config.record.ta) || ''
+            ,itemCls: 'contentblocks_replacement'
         },{
             id: 'modx-content-below'
             ,border: false
@@ -195,11 +196,6 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
                 ,hiddenName: 'createdby'
                 ,id: 'modx-resource-createdby'
                 ,allowBlank: true
-                ,baseParams: {
-                    action: 'getList'
-                    ,combo: '1'
-                    ,limit: 0
-                }
                 ,width: 300
                 ,value: config.record.createdby || MODx.user.id
             },{
@@ -229,11 +225,6 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
                 ,id: 'modx-resource-template'
                 ,anchor: '100%'
                 ,editable: false
-                ,baseParams: {
-                    action: 'getList'
-                    ,combo: '1'
-                    ,limit: '0'
-                }
             },{
                 xtype: 'textfield'
                 ,fieldLabel: _('articles.article_alias')
@@ -340,4 +331,4 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
         Ext.apply(o.form.baseParams,d);
     }
 });
-Ext.reg('modx-panel-article',Articles.panel.Article);
+Ext.reg('modx-panel-article',Articles.panel.Article);

assets/components/articles/js/article/update.js

@@ -10,13 +10,20 @@ Articles.page.UpdateArticle = function(config) {
     Articles.page.UpdateArticle.superclass.constructor.call(this,config);
 };
 Ext.extend(Articles.page.UpdateArticle,MODx.page.UpdateResource,{
-
-    getButtons: function(cfg) {
+	doesButtonExist: function(btnArray, lexiconKey) {
+		var exists = false;
+		btnArray.map(function(item) {
+			if(lexiconKey == item.text) exists = true;
+		});
+		return exists;
+	}
+    ,getButtons: function(cfg) {
         var btns = [];
-        if (cfg.canSave == 1) {
+        if (cfg.canSave == 1 && !this.doesButtonExist(btns, _('save'))) {
             btns.push({
-                process: 'update'
+                process: (MODx.config.connector_url) ? 'resource/update' : 'update'
                 ,text: _('save')
+                ,cls: 'primary-button'
                 ,method: 'remote'
                 ,checkDirty: cfg.richtext || MODx.request.activeSave == 1 ? false : true
                 ,keys: [{
@@ -25,53 +32,69 @@ Ext.extend(Articles.page.UpdateArticle,MODx.page.UpdateResource,{
                 }]
             });
             btns.push('-');
-        } else if (cfg.locked) {
+        } else if (cfg.locked && !this.doesButtonExist(btns, _('locked'))) {
             btns.push({
                 text: cfg.lockedText || _('locked')
                 ,handler: Ext.emptyFn
                 ,disabled: true
             });
             btns.push('-');
         }
-        btns.push({
-            text: _('articles.article_publish')
-            ,id: 'modx-article-publish'
-            ,hidden: cfg.record.published ? true : false
-            ,handler: this.publishArticle
-        });
-        btns.push({
-            text: _('articles.article_unpublish')
-            ,id: 'modx-article-unpublish'
-            ,hidden: cfg.record.published ? false : true
-            ,handler: this.unpublishArticle
-        });
-        btns.push('-');
-        btns.push({
-            process: 'preview'
-            ,text: _('view')
-            ,handler: this.preview
-            ,scope: this
-        });
-        btns.push('-');
-        btns.push({
-            process: 'cancel'
-            ,text: _('cancel')
-            ,handler: this.cancel
-            ,scope: this
-        });
-        btns.push('-');
-        btns.push({
-            text: _('help_ex')
-            ,handler: MODx.loadHelpPane
-        });
-        return btns;
+	    if(cfg.publish_document && !this.doesButtonExist(btns, _('articles.article_publish'))) {
+	        btns.push({
+	            text: _('articles.article_publish')
+	            ,id: 'modx-article-publish'
+	            ,hidden: cfg.record.published ? true : false
+	            ,handler: this.publishArticle
+	        });
+	        btns.push({
+	            text: _('articles.article_unpublish')
+	            ,id: 'modx-article-unpublish'
+	            ,hidden: cfg.record.published ? false : true
+	            ,handler: this.unpublishArticle
+	        });
+		    btns.push('-');
+	    }
+		if(!this.doesButtonExist(btns, _('view'))) {
+	        btns.push({
+	            process: 'preview'
+	            ,text: _('view')
+	            ,handler: this.preview
+	            ,scope: this
+	        });
+	        btns.push('-');
+		}
+		if(!this.doesButtonExist(btns, _('cancel'))) {
+	        btns.push({
+	            process: 'cancel'
+	            ,text: _('cancel')
+	            ,handler: this.cancel
+	            ,scope: this
+	        });
+	        btns.push('-');
+		}
+		if(!this.doesButtonExist(btns, _('help_ex'))) {
+	        btns.push({
+	            text: _('help_ex')
+	            ,handler: MODx.loadHelpPane
+	        });
+		}
+
+		// remove duplicate spacings
+		for(var i=0; i<=(btns.length - 1); i++) {
+			var item = btns[i];
+			if(item != '-') continue;
+			if(btns[i+1] == '-' || (btns[i+1] && btns[i+1].hidden == true)) btns.splice(i,1);
+		}
+
+		return btns;
     }
 
     ,publishArticle: function(btn,e) {
         MODx.Ajax.request({
-            url: MODx.config.connectors_url+'resource/index.php'
+            url: (MODx.config.connector_url) ? MODx.config.connector_url : MODx.config.connectors_url+'resource/index.php'
             ,params: {
-                action: 'publish'
+                action: (MODx.config.connector_url) ? 'resource/publish' : 'publish'
                 ,id: MODx.request.id
             }
             ,listeners: {
@@ -99,9 +122,9 @@ Ext.extend(Articles.page.UpdateArticle,MODx.page.UpdateResource,{
 
     ,unpublishArticle: function(btn,e) {
         MODx.Ajax.request({
-            url: MODx.config.connectors_url+'resource/index.php'
+            url: (MODx.config.connector_url) ? MODx.config.connector_url : MODx.config.connectors_url+'resource/index.php'
             ,params: {
-                action: 'unpublish'
+                action: (MODx.config.connector_url) ? 'resource/unpublish' : 'unpublish'
                 ,id: MODx.request.id
             }
             ,listeners: {
@@ -305,6 +328,7 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
             ,height: 400
             ,grow: false
             ,value: (config.record.content || config.record.ta) || ''
+            ,itemCls: 'contentblocks_replacement'
         },{
             id: 'modx-content-below'
             ,border: false
@@ -371,11 +395,6 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
                 ,hiddenName: 'createdby'
                 ,id: 'modx-resource-createdby'
                 ,allowBlank: true
-                ,baseParams: {
-                    action: 'getList'
-                    ,combo: '1'
-                    ,limit: 0
-                }
                 ,width: 300
                 ,value: config.record.createdby
             },{
@@ -405,11 +424,6 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
                 ,id: 'modx-resource-template'
                 ,anchor: '100%'
                 ,editable: false
-                ,baseParams: {
-                    action: 'getList'
-                    ,combo: '1'
-					,limit: '0'
-                }
             },{
                 xtype: 'textfield'
                 ,fieldLabel: _('articles.article_alias')
@@ -539,4 +553,4 @@ Ext.extend(Articles.panel.Article,MODx.panel.Resource,{
         }
     }
 });
-Ext.reg('modx-panel-article',Articles.panel.Article);
+Ext.reg('modx-panel-article',Articles.panel.Article);

assets/components/articles/js/container/articles.import.window.js

@@ -5,9 +5,9 @@ Articles.window.ArticlesImport = function(config) {
     Ext.applyIf(config,{
         title: _('articles.articles_import')
         ,id: this.ident
-        ,height: 150
-        ,width: '75%'
-        ,minWidth: 650
+        // ,height: 150
+        // ,width: '75%'
+        ,width: 600
         ,url: Articles.connector_url
         ,action: 'container/import'
         ,fileUpload: true
@@ -81,12 +81,13 @@ Articles.panel.ImportOptionsWordPress = function(config) {
             msgTarget: 'under'
         }
         ,items: [{
-            xtype: 'textfield'
-            ,inputType: 'file'
+            xtype: (MODx.config.connector_url) ? 'fileuploadfield' : 'textfield' // check for 2.3
+            ,buttonText: _('upload.buttons.upload')
             ,name: 'wp-file'
             ,fieldLabel: _('articles.import_wp_file')
+            ,inputType: (MODx.config.connector_url) ? 'text' : 'file' // check for 2.3
             ,id: this.ident+'-wp-file'
-            ,anchor: '98%'
+            ,anchor: (MODx.config.connector_url) ? '100%' : '98%' // check for 2.3
         },{
             xtype: MODx.expandHelp ? 'label' : 'hidden'
             ,forId: this.ident+'-wp-file'
@@ -98,7 +99,7 @@ Articles.panel.ImportOptionsWordPress = function(config) {
             ,fieldLabel: _('articles.import_wp_file_server')
             ,description: MODx.expandHelp ? '' : _('articles.import_wp_file_server')
             ,id: this.ident+'-wp-file-server'
-            ,anchor: '98%'
+            ,anchor: (MODx.config.connector_url) ? '100%' : '98%' // check for 2.3
             ,value: '{core_path}import/'
         },{
             xtype: MODx.expandHelp ? 'label' : 'hidden'
@@ -264,12 +265,13 @@ Articles.panel.ImportOptionsBlogger = function(config) {
             msgTarget: 'under'
         }
         ,items: [{
-            xtype: 'textfield'
-            ,inputType: 'file'
+            xtype: (MODx.config.connector_url) ? 'fileuploadfield' : 'textfield' // check for 2.3
+            ,buttonText: _('upload.buttons.upload')
             ,name: 'blogger-file'
             ,fieldLabel: _('articles.import_blogger_file')
+            ,inputType: (MODx.config.connector_url) ? 'text' : 'file' // check for 2.3
             ,id: this.ident+'-blogger-file'
-            ,anchor: '98%'
+            ,anchor: (MODx.config.connector_url) ? '100%' : '98%' // check for 2.3
         },{
             xtype: MODx.expandHelp ? 'label' : 'hidden'
             ,forId: this.ident+'-blogger-file'
@@ -281,7 +283,7 @@ Articles.panel.ImportOptionsBlogger = function(config) {
             ,fieldLabel: _('articles.import_blogger_file_server')
             ,description: MODx.expandHelp ? '' : _('articles.import_blogger_file_server')
             ,id: this.ident+'-blogger-file-server'
-            ,anchor: '98%'
+            ,anchor: (MODx.config.connector_url) ? '100%' : '98%' // check for 2.3
             ,value: '{core_path}import/'
         },{
             xtype: MODx.expandHelp ? 'label' : 'hidden'