jsharmony-cms 1.5.0 → 1.5.4

package/doc/deployment_target.json

@@ -101,6 +101,12 @@
     "onDeploy": true,            //true (all), false (none), or array of items, ex: ["page","media"] 
     "onDeploy_PostBuild": true,  //true (all), false (none), or array of items, ex: ["page","media"]
   },
+  //Remote folders or files to ignore when deleting excess files on publish
+  //Use with FTP, FTPS, SFTP, S3, and Local File System deployments
+  "ignore_remote": [
+    "path/to/folder",
+    "path/to/file"
+  ]
 }
 
 //Template Variables

package/models/Branch_Clone.js

@@ -9,9 +9,7 @@ jsh.App[modelid] = new (function(){
       jChangeStatus.html(XExt.renderClientEJS(tmpl, { _: _, jsh: jsh }));
     }
     else {
-      jChangeStatus.hide(); //Control
-      jChangeStatus.prev('.xform_caption').hide(); //Caption
-      jChangeStatus.prev().prev('br').hide(); //Newline
+      jsh.$root('.'+xmodel.class+'_change_status_group').hide();
     }
   };
 

package/models/Branch_Clone.json

@@ -28,7 +28,9 @@
         "lov":{ "sql": "select 'PUBLIC' code_val, 'Release' code_txt where ({schema}.my_user_is_publisher({schema}.my_current_site_id()) = 1) union all select 'USER' code_val, (select concat(sys_user_fname,' ',sys_user_lname) from jsharmony.sys_user where jsharmony.sys_user.sys_user_id=jsharmony.my_sys_user_id()) code_txt" } },
       {"control":"html","value":" / ","nl":false},
       {"name":"new_branch_name","actions":"BU","type":"varchar","control":"textbox","caption":"","nl":false,"validate":["Required"],"caption_ext":"New Revision Name","focus":true,"controlparams":{"placeholder":"New Revision Name"}},
-      {"control":"html","value":"<div class='<%=model.class%>_Change_Status'></div>","caption":"Change Status","captionstyle":"vertical-align:top;font-weight:bold;padding-top:3px;"},
+      {"control":"html","value":"<span class='<%=model.class%>_change_status_group'>"},
+      {"control":"html","value":"<div class='<%=model.class%>_Change_Status'></div>","caption":"Change Status","captionclass":"Change_Status_caption","captionstyle":"vertical-align:top;font-weight:bold;padding-top:3px;"},
+      {"control":"html","value":"</span>"},
       {"name":"new_branch_changes","control":"hidden","type":"varchar","length":8,"actions":"BU","ongetvalue":"return _this.Change_Status_getvalue(val,field,xmodel);"},
       {"control":"button","value":"Clone","controlstyle": "padding:3px 8px;margin-top:6px;","onclick": "if(!xmodel.controller.form.Data.Commit()) return; XForm.prototype.XExecutePost(xmodel.id+'/?branch_id='+xmodel.get('branch_id'), { new_branch_type: xmodel.get('new_branch_type'), new_branch_name: xmodel.get('new_branch_name'), new_branch_changes: xmodel.get('new_branch_changes')  }, function(rslt){ xmodel.controller.form.ResetDirty(); XExt.navTo(jsh._BASEURL+xmodel.module_namespace+'Sitemap_Listing_Redirect'); });"}
     ]

package/models/Branch_Diff.json

@@ -17,7 +17,7 @@
       {"name":"branch_user_id_fmt","caption":"Author","control":"label","sqlselect":"(jsharmony.get_sys_user_name(branch_user_id))"},
       {"name":"branch_sts","caption":"Status","control":"label"},
       {"name":"branch_data_mtstmp_fmt","type":"datetime","caption":"Last Modified","sqlselect":"$ifnull(branch_data_mtstmp,branch_mtstmp)","control":"label","format":["date","MM/DD/YYYY h:mm a"]},
-      {"caption":"Actions","control":"html","captionstyle":"display:none;vertical-align:top;padding-top:5px;font-weight:bold;text-align:right;",
+      {"caption":"Actions","control":"html","captionstyle":"display:none;vertical-align:top;padding-top:5px;font-weight:bold;text-align:right;","captionclass":"actions_bar_caption",
         "value":"<div class='<%=model.class%>_actions_bar jsHarmonyCms_Branch_Summary_Actions_Bar'></div>"},
       {"name":"branch_merge_desc","caption":"Merge In Progress","control":"label","captionstyle":"font-weight:bold;text-align:right;","block":true,"blockclass":"branch_merge_desc","sqlselect":"(select branch_desc from {schema}.branch merge_branch inner join {schema}.v_my_branch_desc merge_branch_desc on (merge_branch.branch_id=v_my_branch_desc.branch_id and merge_branch.branch_merge_id=merge_branch_desc.branch_id))"},
       {"name":"branch_type","control":"hidden"},

package/models/Branch_Summary.js

@@ -19,7 +19,7 @@ jsh.App[modelid] = new (function(){
     }
     var diffModel = jsh.XModels[jsh.$root('.xform'+xmodel.class+' .xsubform_diff .xpanel .xform').first().data('id')];
     var actionsBar = jsh.$root('.'+diffModel.class+'_actions_bar');
-    actionsBar.prev('.xform_caption').show();
+    jsh.$root('.xform'+diffModel.class+' .actions_bar_caption').show();
     var buttonGroup = jsh.$root('.xactions_group.xelem'+xmodel.class+'[data-group="Actions"]');
     actionsBar.html(buttonGroup.html());
   }

package/models/Menu_Tree_Info.js

@@ -61,18 +61,11 @@ jsh.App[modelid] = new (function(){
   this.updateEnabledState = function(){
     var menu_item_link_type = xmodel.get('menu_item_link_type');
 
-    var jtarget = $('.menu_item_link_target.xelem'+xmodel.class);
-    var jtarget_group = jtarget.add(jtarget.prevUntil('.xelem'+xmodel.class));
-
-    var jdest = $('.menu_item_link_dest.xelem'+xmodel.class);
-    var jdestcaption = jdest.prev();
-    var jdest_group = jdest.add(jdest.prevUntil('.xelem'+xmodel.class));
-
-    var jdest_page = $('.menu_item_link_page.xelem'+xmodel.class);
-    var jdest_page_group = jdest_page.add(jdest_page.prevUntil('.xelem'+xmodel.class)).add(jdest_page.next('.xelem'+xmodel.class));
-
-    var jdest_media = $('.menu_item_link_media.xelem'+xmodel.class);
-    var jdest_media_group = jdest_media.add(jdest_media.prevUntil('.xelem'+xmodel.class)).add(jdest_media.next('.xelem'+xmodel.class));
+    var jtarget_group = $('.'+xmodel.class+'_link_target_group');
+    var jdestcaption = $('.sitemap_item_link_dest_caption');
+    var jdest_group = $('.'+xmodel.class+'_link_dest_group');
+    var jdest_page_group = $('.'+xmodel.class+'_link_page_group');
+    var jdest_media_group = $('.'+xmodel.class+'_link_media_group');
 
     var enable_target = true;
     var enable_dest = false;

package/models/Menu_Tree_Info.json

@@ -20,18 +20,26 @@
       {"name":"menu_item_path","control":"hidden"},
       {"name":"menu_item_text","control":"textbox_M","caption":"Text","controlstyle":"width:300px;","validate":["Required"],"nl":true,"onchange":"_this.menu_item_text_onchange(obj,newval);", "captionstyle":"width:68px;"},
       {"name":"menu_item_link_type","control":"dropdown","caption":"Link Type","lov":{ "blank": "(No Link)", "values": { "JS": "JavaScript", "MEDIA": "Media", "PAGE": "Page", "URL": "URL" } }, "onchange":"_this.menu_item_link_type_onchange(obj, newval, undoChange);","nl":true},
+      {"control":"html","value":"<span class='<%=model.class%>_link_target_group'>"},
       {"name":"menu_item_link_target","control":"dropdown","caption":"Target","lov":{ "blank": "Same Window", "values": { "NEWWIN": "New Window" } }},
+      {"control":"html","value":"</span>"},
 
-      {"name":"menu_item_link_dest","control":"textbox_L","caption":"Destination","controlstyle":"width:300px;","nl":true,
+      {"control":"html","value":"<span class='<%=model.class%>_link_dest_group'>"},
+      {"name":"menu_item_link_dest","control":"textbox_L","caption":"Destination","captionclass":"menu_item_link_dest_caption","controlstyle":"width:300px;","nl":true,
         "validate":[{"function":"js:if((_obj.menu_item_link_type=='URL') && !_obj.menu_item_link_dest) return 'URL is required'; if((_obj.menu_item_link_type=='JS') && !_obj.menu_item_link_dest) return 'JS is required';"}]},
+      {"control":"html","value":"</span>"},
 
+      {"control":"html","value":"<span class='<%=model.class%>_link_page_group'>"},
       {"name":"menu_item_link_page","control":"textbox_M","caption":"Page","controlstyle":"margin-right:4px;","readonly":true,"nl":true,
         "validate":[{"function":"js:if((_obj.menu_item_link_type=='PAGE') && !_obj.menu_item_link_dest) return 'Page is required';"}]},
       {"name":"menu_item_link_page_browse","control":"button","value":"Browse","onclick":"js:_this.browsePage();","actions":"IU"},
+      {"control":"html","value":"</span>"},
 
+      {"control":"html","value":"<span class='<%=model.class%>_link_media_group'>"},
       {"name":"menu_item_link_media","control":"textbox_M","caption":"Media","controlstyle":"margin-right:4px;","readonly":true,"nl":true,
         "validate":[{"function":"js:if((_obj.menu_item_link_type=='MEDIA') && !_obj.menu_item_link_dest) return 'Media is required';"}]},
       {"name":"menu_item_link_media_browse","control":"button","value":"Browse","onclick":"js:_this.browseMedia();","actions":"IU"},
+      {"control":"html","value":"</span>"},
 
       {"control":"html","value":"<div class='<%=model.class%>_divider'>:: Advanced Options</div>","nl":true},
       {"name":"menu_item_type","control":"dropdown","caption":"Render As","default":"TEXT","lov":{ "blank": false, "values": { "TEXT": "Text", "HTML": "HTML" } }, "captionstyle":"width:130px;"},

package/models/Sitemap_Tree_Info.js

@@ -113,18 +113,11 @@ jsh.App[modelid] = new (function(){
   this.render = function(){
     var sitemap_item_link_type = xmodel.get('sitemap_item_link_type');
 
-    var jtarget = $('.sitemap_item_link_target.xelem'+xmodel.class);
-    var jtarget_group = jtarget.add(jtarget.prevUntil('.xelem'+xmodel.class));
-
-    var jdest = $('.sitemap_item_link_dest.xelem'+xmodel.class);
-    var jdestcaption = jdest.prev();
-    var jdest_group = jdest.add(jdest.prevUntil('.xelem'+xmodel.class));
-
-    var jdest_page = $('.sitemap_item_link_page.xelem'+xmodel.class);
-    var jdest_page_group = jdest_page.add(jdest_page.prevUntil('.xelem'+xmodel.class)).add(jdest_page.next('.xelem'+xmodel.class));
-
-    var jdest_media = $('.sitemap_item_link_media.xelem'+xmodel.class);
-    var jdest_media_group = jdest_media.add(jdest_media.prevUntil('.xelem'+xmodel.class)).add(jdest_media.next('.xelem'+xmodel.class));
+    var jtarget_group = $('.'+xmodel.class+'_link_target_group');
+    var jdestcaption = $('.sitemap_item_link_dest_caption');
+    var jdest_group = $('.'+xmodel.class+'_link_dest_group');
+    var jdest_page_group = $('.'+xmodel.class+'_link_page_group');
+    var jdest_media_group = $('.'+xmodel.class+'_link_media_group');
 
     var enable_target = true;
     var enable_dest = false;

package/models/Sitemap_Tree_Info.json

@@ -30,18 +30,26 @@
       {"name":"sitemap_item_path","control":"hidden"},
       {"name":"sitemap_item_text","control":"textbox_M","controlstyle":"width:300px;","caption":"Link Text","validate":["Required"],"nl":true,"onchange":"_this.sitemap_item_text_onchange(obj,newval);", "captionstyle":"width:68px;"},
       {"name":"sitemap_item_link_type","control":"dropdown","caption":"Link Type","lov":{ "blank": "(No Link)", "values": { "JS": "JavaScript", "MEDIA": "Media", "PAGE": "Page", "URL": "URL" } }, "onchange":"_this.sitemap_item_link_type_onchange(obj, newval, undoChange);","nl":true},
+      {"control":"html","value":"<span class='<%=model.class%>_link_target_group'>"},
       {"name":"sitemap_item_link_target","control":"dropdown","caption":"Target","lov":{ "blank": "Same Window", "values": { "NEWWIN": "New Window" } }},
+      {"control":"html","value":"</span>"},
 
-      {"name":"sitemap_item_link_dest","control":"textbox_L","caption":"Destination","controlstyle":"width:300px;","nl":true,
+      {"control":"html","value":"<span class='<%=model.class%>_link_dest_group'>"},
+      {"name":"sitemap_item_link_dest","control":"textbox_L","caption":"Destination","captionclass":"sitemap_item_link_dest_caption","controlstyle":"width:300px;","nl":true,
         "validate":[{"function":"js:if((_obj.sitemap_item_link_type=='URL') && !_obj.sitemap_item_link_dest) return 'URL is required'; if((_obj.sitemap_item_link_type=='JS') && !_obj.sitemap_item_link_dest) return 'JS is required';"}]},
+      {"control":"html","value":"</span>"},
 
+      {"control":"html","value":"<span class='<%=model.class%>_link_page_group'>"},
       {"name":"sitemap_item_link_page","control":"textbox_M","caption":"Page","controlstyle":"margin-right:4px;","readonly":true,"nl":true,
         "validate":[{"function":"js:if((_obj.sitemap_item_link_type=='PAGE') && !_obj.sitemap_item_link_dest) return 'Page is required';"}]},
       {"name":"sitemap_item_link_page_browse","control":"button","value":"Browse","onclick":"js:_this.browsePage();","actions":"IU"},
+      {"control":"html","value":"</span>"},
 
+      {"control":"html","value":"<span class='<%=model.class%>_link_media_group'>"},
       {"name":"sitemap_item_link_media","control":"textbox_M","caption":"Media","controlstyle":"margin-right:4px;","readonly":true,"nl":true,
         "validate":[{"function":"js:if((_obj.sitemap_item_link_type=='MEDIA') && !_obj.sitemap_item_link_dest) return 'Media is required';"}]},
       {"name":"sitemap_item_link_media_browse","control":"button","value":"Browse","onclick":"js:_this.browseMedia();","actions":"IU"},
+      {"control":"html","value":"</span>"},
 
       {"control":"html","value":"<div class='<%=model.class%>_page_options'>"},
       {"control":"html","value":"<div class='<%=model.class%>_divider'>:: Page</div>"},

package/models/_funcs.deploy.js

@@ -1835,7 +1835,7 @@ module.exports = exports = function(module, funcs){
           function(generate_cb){
             async.eachOfSeries(branchData.site_config.media_thumbnails, function(thumbnail_config, thumbnail_id, thumbnail_cb){
               if(!thumbnail_config || !thumbnail_config.export) return thumbnail_cb();
-              if(!_.includes(['.jpg','.jpeg','.tif','.tiff','.png','.gif','.svg'], media.media_ext)) return cb();
+              if(!_.includes(['.jpg','.jpeg','.tif','.tiff','.png','.gif','.svg'], media.media_ext)) return thumbnail_cb();
 
               funcs.getMediaFile(media.media_file_id, media.media_filename, media.media_ext, thumbnail_id, thumbnail_config, function(err, thumbnail_srcpath, thumbnail_fname, stat){
                 if(err) return thumbnail_cb('Error getting thumbnail for '+media_fpath+':'+thumbnail_id+' - '+err.toString());
@@ -2011,27 +2011,16 @@ module.exports = exports = function(module, funcs){
 
   exports.deploy_ignore_remote = function(publish_params, fpath){
     if(fpath=='.git') return true;
-    return false;
-    /*
     if(!publish_params || !publish_params.ignore_remote) return false;
-    var origpath = fpath;
     fpath = HelperFS.convertWindowsToPosix(fpath);
-    while(fpath){
-      for(var i=0;i<publish_params.ignore_remote.length;i++){
-        var ignore_expr = publish_params.ignore_remote[i];
-        if(!ignore_expr) continue;
-        if(ignore_expr.regex){
-        }
-        else {
-          if(ignore_expr == fpath) return true;
-        }
-      }
-      fpath = path.dirname(fpath);
-      if(fpath=='.') fpath = '';
-      if(fpath=='..') fpath = '';
+    for(var i=0;i<publish_params.ignore_remote.length;i++){
+      var ignore_expr = publish_params.ignore_remote[i];
+      if(!ignore_expr) continue;
+      var ignore_path = HelperFS.convertWindowsToPosix(ignore_expr.toString());
+      if(ignore_path == fpath) return true;
+      if(fpath.indexOf(ignore_path+'/')==0) return true;
     }
-    return true;
-    */
+    return false;
   }
 
   exports.deploy_fs = function(deployment, publish_path, deploy_path, site_files, cb){
@@ -2613,7 +2602,9 @@ module.exports = exports = function(module, funcs){
             if(site_md5 != s3_md5) s3_upload.push(fname);
           }
           else {
-            s3_delete.push(fname);
+            if(!funcs.deploy_ignore_remote(deployment.publish_params, fname)){
+              s3_delete.push(fname);
+            }
           }
         }
         for(var fname in site_files){

package/models/_funcs.page.js

@@ -447,7 +447,7 @@ module.exports = exports = function(module, funcs){
       var rslt = funcs.replaceBranchURLs(content, _.extend({ replaceComponents: true }, options, {
         getMediaURL: function(media_key, thumbnail_id, branchData, getLinkContent, urlparts){
           if(!media_files){
-            return baseurl + urlparts.path.substr(1) + '#@JSHCMS';
+            return baseurl + urlparts.pathname.substr(1) + '#@JSHCMS';
           }
           return baseurl+'_funcs/media/'+media_key+(thumbnail_id?'/'+thumbnail_id:'')+'/?media_id='+media_files[media_key].media_id+'#@JSHCMS';
         },

package/models/_funcs.template.js

@@ -1693,7 +1693,8 @@ module.exports = exports = function(module, funcs){
       if(thumbnails[key].responsive) responsiveThumbnails[key] = thumbnails[key];
     }
 
-    if(_.isEmpty(responsiveThumbnails)) return content;
+    var lcontent = content.toLowerCase();
+    if(_.isEmpty(responsiveThumbnails) && (lcontent.indexOf('cms-image-dimensions') < 0)) return content;
 
     //If no img tags, return
     if(content.toLowerCase().indexOf('img') < 0) return content;
@@ -1705,7 +1706,7 @@ module.exports = exports = function(module, funcs){
         exec: function(node){
           var src = (htdoc.getAttr(node, 'src')||'').toString();
           if(!src) return;
-          if(htdoc.hasAttr(node, 'srcset')) return;
+          if(htdoc.hasAttr(node, 'srcset') && !htdoc.hasAttr(node, 'cms-image-dimensions')) return;
 
           //Check for #@JSHCMS
           var urlparts = null;
@@ -1727,42 +1728,62 @@ module.exports = exports = function(module, funcs){
           //Check if media_key is valid
           var media_item = media_items[media_key];
           var media_width = 0;
-          if(media_item && media_item.media_width) media_width = media_item.media_width;
+          var media_height = 0;
+          if(media_item){
+            if(media_item.media_width) media_width = media_item.media_width;
+            if(media_item.media_height) media_height = media_item.media_height;
+          }
           if(media_thumbnail && (media_thumbnail in thumbnails)){
             var tgtThumbnail = thumbnails[media_thumbnail];
-            if(tgtThumbnail.resize && tgtThumbnail.resize.length) media_width = tgtThumbnail.resize[0];
-            else if(tgtThumbnail.crop && tgtThumbnail.crop.length) media_width = tgtThumbnail.crop[0];
+            if(tgtThumbnail.resize && tgtThumbnail.resize.length){
+              media_width = tgtThumbnail.resize[0];
+              media_height = tgtThumbnail.resize[1];
+            }
+            else if(tgtThumbnail.crop && tgtThumbnail.crop.length){
+              media_width = tgtThumbnail.crop[0];
+              media_height = tgtThumbnail.crop[1];
+            }
           }
 
-          var srcsets = [];
-          var max_width = media_width;
-          for(var thumbnail_id in responsiveThumbnails){
-            var thumbnail = responsiveThumbnails[thumbnail_id];
-            var srcsetCondition = '';
-            if(_.isString(thumbnail.responsive)) srcsetCondition = thumbnail.responsive;
-            else {
-              var thumbnail_width = 0;
-              if(media_item && media_item.media_width) thumbnail_width = media_item.media_width;
-              if(thumbnail.resize && thumbnail.resize.length) thumbnail_width = thumbnail.resize[0];
-              else if(thumbnail.crop && thumbnail.crop.length) thumbnail_width = thumbnail.crop[0];
-
-              if(thumbnail_width && (!media_width || (thumbnail_width < media_width))){
-                srcsetCondition = thumbnail_width + 'w';
-                if(thumbnail_width >= max_width) max_width = thumbnail_width + 1;
+          if(!htdoc.hasAttr(node, 'srcset')){
+            var srcsets = [];
+            var max_width = media_width;
+            for(var thumbnail_id in responsiveThumbnails){
+              var thumbnail = responsiveThumbnails[thumbnail_id];
+              var srcsetCondition = '';
+              if(_.isString(thumbnail.responsive)) srcsetCondition = thumbnail.responsive;
+              else {
+                var thumbnail_width = 0;
+                if(media_item && media_item.media_width) thumbnail_width = media_item.media_width;
+                if(thumbnail.resize && thumbnail.resize.length) thumbnail_width = thumbnail.resize[0];
+                else if(thumbnail.crop && thumbnail.crop.length) thumbnail_width = thumbnail.crop[0];
+
+                if(thumbnail_width && (!media_width || (thumbnail_width < media_width))){
+                  srcsetCondition = thumbnail_width + 'w';
+                  if(thumbnail_width >= max_width) max_width = thumbnail_width + 1;
+                }
+              }
+
+              if(srcsetCondition){
+                //Generate srcset
+                var srcsetUrl = urlparts.protocol+'//'+urlparts.host+'/_funcs/media/'+media_key+'/'+thumbnail_id+'/#@JSHCMS'+urlparts.hash.substr(('#@JSHCMS').length);
+                srcsets.push(srcsetUrl+' '+srcsetCondition);
               }
             }
 
-            if(srcsetCondition){
-              //Generate srcset
-              var srcsetUrl = urlparts.protocol+'//'+urlparts.host+'/_funcs/media/'+media_key+'/'+thumbnail_id+'/#@JSHCMS'+urlparts.hash.substr(('#@JSHCMS').length);
-              srcsets.push(srcsetUrl+' '+srcsetCondition);
+            //Update img tag
+            if(srcsets.length){
+              srcsets.unshift(src + ' ' + max_width + 'w');
+              htdoc.appendAttr(node, 'srcset', srcsets.join(', '), 'srcset');
             }
           }
 
-          //Update img tag
-          if(srcsets.length){
-            srcsets.push(src + ' ' + max_width + 'w');
-            htdoc.appendAttr(node, 'srcset', srcsets.join(', '), 'srcset');
+          if(media_width && media_height && htdoc.hasAttr(node, 'cms-image-dimensions')){
+            if(!htdoc.hasAttr(node, 'width') && !htdoc.hasAttr(node, 'height')){
+              htdoc.appendAttr(node, 'width', media_width.toString());
+              htdoc.appendAttr(node, 'height', media_height.toString());
+              htdoc.removeAttr(node, 'cms-image-dimensions');
+            }
           }
         }
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony-cms",
-  "version": "1.5.0",
+  "version": "1.5.4",
   "description": "jsHarmony CMS",
   "main": "index.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "diff2html": "3.4.1",
     "ejs": "2.7.4",
     "js-beautify": "^1.11.0",
-    "jsharmony": "^1.4.0",
+    "jsharmony": "^1.5.2",
     "jsharmony-factory": "^1.2.0",
     "lodash": "^4.17.19",
     "node-forge": "^0.10.0",

package/views/jsh_cms_editor.ejs

@@ -281,6 +281,7 @@ cms-content-editor
 cms-content-editor-type
 cms-component-editor-remove-class
 cms-component-editor-add-class
+cms-image-dimensions
 
 ===================
 EJS Container Slurp