imagine_cms 5.2.0 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a2d2087d9caf255378b1213b70ef79ce96674fd68158faa3d175a0efcc49bcb
-  data.tar.gz: 3d26b91a3140cc36df6ce24dcd8aa0c8042d178a1596d152990bab1f8da6aba4
+  metadata.gz: 6395698e5fa9fccc7b7ae4d5178857dcd5678084505cc4df08da0a9f1ab23517
+  data.tar.gz: ef698c30a3234bb349183c084ea98dd2524e518b62270c5f18507b7631ad470e
 SHA512:
-  metadata.gz: 4cd0d6ba6f816b5d8a4de2f63f5947bac71a4ee02ece4fa26af8d79db2b87c5d2360d7eb5f863ddb0667615e41731473a8d77d6ea0b3c5f013e751d8b86bd0ab
-  data.tar.gz: 28b07e811ffd01c9df9db417f75bfc782f44c72779441a2a70aab854c59d2f222ad4433d8492a7d0ff94b4c47b7f1efbe2882a20fbde7e4b9f78cf69fba197d6
+  metadata.gz: 0afe6cdfe911f124645fa829ea9e0c90c702261fefba1d49b86826adec69a15ae0c5909230cb349a26b21c51d6dc503b58949b933e4c4b7546937960d4ab2c54
+  data.tar.gz: 789fdb963f54155a91a74728e4ca0be2e7a75adaba77d8bf7e7a9a62e897b0fe9fa472c93790c74cca5dc5c68c449a1ee797cd9b5f92dcb57471afbc855c6c1d

data/Dockerfile

@@ -1,61 +1,35 @@
 ### Docker image for imagine5 ###
 
-# See https://github.com/phusion/passenger-docker/blob/master/Changelog.md for a list of version numbers.
-FROM phusion/passenger-ruby25:1.0.0
-LABEL maintainer="aaron@aaronnamba.com"
+# See https://hub.docker.com/r/anamba/rails-dev/tags/ for a list of tags
+FROM anamba/rails-dev:1.2.0
+LABEL maintainer="bbsoftware@biggerbird.com"
 
-# Set up 3rd party repos
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
-
-# Update package list
+# Update package list and upgrade pre-installed packages
 RUN apt-get update
-
-# Upgrade other preinstalled packages
 RUN apt-get upgrade -y -o Dpkg::Options::="--force-confnew"
 
 # Install other packages we depend on
-RUN apt-get install -y nodejs yarn
-RUN apt-get install -y tzdata
-RUN apt-get install -y mysql-client
+# RUN apt-get install -y mysql-client
+RUN apt-get install -y memcached
 RUN apt-get install -y libmagickcore-dev libmagickwand-dev  # for rmagick2 gem
 RUN apt-get install -y imagemagick                          # for mini-magick gem
-RUN apt-get install -y openjdk-8-jre-headless               # java for fop
-RUN apt-get install -y memcached                            # for rack-attack and rails cache
-RUN apt-get install -y cmake pkg-config                     # for rugged (git)
+# RUN apt-get install -y openjdk-8-jre-headless             # java for fop (rarely used; add to your own Dockerfile if you need it)
 RUN apt-get autoremove -y
 
-# Enable services
-RUN rm -f /etc/service/nginx/down
+# apt clean up
+RUN apt-get clean && rm -rf /tmp/* /var/tmp/*
+# RUN rm -rf /var/lib/apt/lists/*
 
-# Add custom services
-RUN mkdir /etc/service/memcached
-COPY docker/services/memcached.sh /etc/service/memcached/run
-# RUN mkdir /etc/service/sidekiq
-# COPY docker/services/sidekiq.sh /etc/service/sidekiq/run
-# RUN mkdir /etc/service/webpack
-# COPY docker/services/webpack.sh /etc/service/webpack/run
-
-# Other startup scripts
-RUN mkdir -p /etc/my_init.d
-COPY docker/startup/101_mkdir.sh /etc/my_init.d/
-COPY docker/startup/201_bundler.sh /etc/my_init.d/
-COPY docker/startup/211_yarn.sh /etc/my_init.d/
+# Add custom vhost
+COPY /docker/conf/nginx-vhost.conf.template /etc/nginx/
 
 # Remove the default vhost (so that ours will respond to any Host)
 RUN rm -f /etc/nginx/sites-enabled/default
 
-# Post-build clean up
-RUN apt-get clean && rm -rf /tmp/* /var/tmp/*
-# RUN rm -rf /var/lib/apt/lists/*
-
-# Expose port 80 to the Docker host, so we can access it from the outside (remember to publish it using `docker run -p`).
-EXPOSE 80
+# Add custom services
+RUN mkdir -p /etc/service/memcached
+RUN rm -f /etc/service/memcached/down
+COPY docker/services/memcached /etc/service/memcached/run
 
 # For convenience
-WORKDIR /home/app/myapp
 COPY docker/conf/.my.cnf /home/app
-
-# Run this to start all services (if no command was provided to `docker run`)
-CMD ["/sbin/my_init"]

data/README.md

@@ -1,4 +1,4 @@
-# Imagine CMS
+# Imagine 5 - Rails-powered CMS
 
 [![Version](https://img.shields.io/github/tag/anamba/imagine_cms.svg?maxAge=360)](https://github.com/anamba/imagine_cms/releases/latest)
 [![License](https://img.shields.io/github/license/anamba/imagine_cms.svg)](https://github.com/anamba/imagine_cms/blob/master/license.txt)
@@ -7,15 +7,21 @@
 Imagine CMS is a web content management system developed by [Bigger Bird Creative, Inc.](https://biggerbird.com) in 2006 for its clients.
 Other CMSes came with a learning curve: not a problem for daily users, but clients who only used it once a month or so would forget everything by the next time they logged in.
 Simpler systems didn't have enough functionality to allow us to do what we wanted to do as designers and developers.
-Thus, we created a CMS that is easy for clients to use, stays out of our way, and provides useful automation (publishing and unpublishing on a schedule, navigation links, RSS feeds, etc.).
+Thus, we created a CMS that is easy for clients to use, stays out of our way, and provides useful automation (lists, publishing and unpublishing on a schedule, navigation links, RSS feeds, etc.).
 
 ## Current Status
 
-Imagine 5.2 is ready for production use (v5.2-stable branch). Imagine 4 is also available for apps tied to Rails 4.2, respectively (v4.2-stable branch).
+[Imagine 6](https://github.com/ImagineCMS/imagine_cms) (Elixir-based) is use in production.
 
-However, unless you are already familiar with Imagine, this project is not suitable for wider use. Why? Well, the purpose of the Imagine gem at this point is strictly to upgrade legacy sites to modern versions of Rails as simply as possible, and to make sure that if something happens to Bigger Bird, our clients will not be left high and dry. This version was never intended to be used by the general public.
+Imagine 5 (this repo) is in use in production, but is being wound down in favor of Imagine 6.
 
-Imagine 7 will be a clean break and a great time to try Imagine CMS. Depending on how smoothly development goes, it could be released before Imagine 6 (awkward...).
+Imagine 4 (v4.2-stable branch) is available for apps tied to Rails 4.2, but is no longer actively maintained.
+
+Imagine 3 (v3.0-stable branch) is available for apps tied to Rails 3.x, but is no longer actively maintained.
+
+Unless you are already familiar with Imagine, this project is not suitable for wider use. Why? Well, the reason this version of Imagine is published on Github is to ensure that if something happens to Bigger Bird, our clients will not be left high and dry. However, this version was never intended to be used by the general public.
+
+Imagine 7 (planned) will be a clean break and a great time to try Imagine CMS.
 
 ## History and Roadmap
 
@@ -31,15 +37,15 @@ All that is now firmly in the past. By extracting Imagine functionality into a R
 * Imagine 4.2 (Rails 4.2, Ruby 2.2): [DONE, v4.2-stable] Compatibility with Rails 4.2, many minor fixes and UI improvements
 * Imagine 5.0 (Rails 5.0, Ruby 2.2): [SKIPPED] Compatibility with Rails 5.0
 * Imagine 5.1 (Rails 5.1, Ruby 2.4): [SKIPPED] Compatibility with Rails 5.1
-* **Imagine 5.2 (Rails 5.2, Ruby 2.5): [CURRENT RELEASE] Compatibility with Rails 5.2**
-* Imagine 6 (Rails 6): [FUTURE] Compatibility with Rails 6
-* Imagine 7 (Crystal): [IN PROGRESS] Rewrite in [Crystal](https://crystal-lang.org/) with [Apache CouchDB](http://couchdb.apache.org/) backend
+* **Imagine 5.2 (Rails 5.2, Ruby 2.5/2.6): [PRODUCTION] Compatibility with Rails 5.2**
+* **Imagine 6 (Elixir/Phoenix + MySQL): [PRODUCTION] Bridge between Imagine 5 and 7**
+* Imagine 7 (Elixir/Phoenix + CouchDB): [PLANNED] Community-driven open source project
 
-Imagine 6 will continue to be Rails-based, but Imagine 7 is a complete, ground-up rewrite in Crystal. Development will begin in a new repository under an Imagine CMS organization, as a proper community-driven open source project (finally!). The core concepts will continue on, but not a single line of code will carry over.
+Imagine 6 is a complete, ground-up rewrite in Elixir, and Imagine 7 builds on that, while also replacing the original MySQL/MariaDB store with CouchDB for improved scaling, redundancy, and replication. Imagine 7 development will also be done in the open, in a new repository under the Imagine CMS organization, as a proper community-driven open source project (finally!). The core concepts will continue on, but not a single line of code will be preserved.
 
 ## Hosting
 
-Imagine 3.x-6.x can run on typical Rails hosting platforms (anything that uses Passenger, Unicorn, Puma, etc.). On hosts that don't allow writing to the local filesystem (e.g. Heroku) you won't be able to use photo galleries or page caching, but other features should work (note: this mode of operation has not been fully tested).
+Imagine 3.x-5.x can run on typical Rails hosting platforms (anything that uses Passenger, Unicorn, Puma, etc.). On hosts that don't allow writing to the local filesystem (e.g. Heroku) you won't be able to use photo galleries or page caching, but other features should work (note: this mode of operation has not been fully tested).
 
 ## Getting Help
 
@@ -47,4 +53,15 @@ Get paid support and hosting for Imagine CMS straight from the people who made i
 
 ## Contributing
 
-Imagine 7 (Crystal) will be a true open source project, but this project (Ruby-based Imagine) will remain more or less closed for the foreseeable future. If companies or individuals are willing to sponsor or co-develop new features, we can work something out.
+Imagine 6 (Elixir rewrite) is now open source and Imagine 7 (MySQL -> CouchDB) will be a true open source project with full community involvement, but this project (Ruby-based Imagine 3.x - 5.x) will remain mostly closed for the foreseeable future (source will continue to be made available on Github, but development will be driven by Bigger Bird only). If companies or individuals are willing to sponsor or co-develop new features, we can work something out.
+
+## Building Docker Image
+
+(notes for myself)
+
+```bash
+docker build -t anamba/imagine5-dev:latest .
+docker tag anamba/imagine5-dev:latest anamba/imagine5-dev:5.2.4
+docker tag anamba/imagine5-dev:latest anamba/imagine5-dev:5.2
+docker push anamba/imagine5-dev
+```

data/app/assets/javascripts/dojo/dojo.js

@@ -9599,7 +9599,7 @@ var _8d9=dojo.html.getUnitValue(this.domNode,"line-height");
 if(_8d9.value&&_8d9.units==""){
 _8d8=_8d9.value;
 }
-dojo.html.insertCssText("body,html{background:transparent;padding:0;margin:0;}"+"body{top:0;left:0;right:0;"+(((this.height)||(dojo.render.html.opera))?"":"position:fixed;")+"font:"+font+";"+"min-height:"+this.minHeight+";"+"line-height:"+_8d8+"}"+"p{margin: 1em 0 !important;}"+"body > *:first-child{padding-top:0 !important;margin-top:"+this._firstChildContributingMargin+"px !important;}"+"body > *:last-child{padding-bottom:0 !important;margin-bottom:"+this._lastChildContributingMargin+"px !important;}"+"li > ul:-moz-first-node, li > ol:-moz-first-node{padding-top:1.2em;}\n"+"li{min-height:1.2em;}"+"",this.document);
+dojo.html.insertCssText("body,html{background:transparent;padding:0;margin:5px;}"+"body{top:0;left:0;right:0;"+(((this.height)||(dojo.render.html.opera))?"":"position:fixed;")+"font:"+font+";"+"min-height:"+this.minHeight+";"+"line-height:"+_8d8+"}"+"p{margin: 1em 0 !important;}"+"body > *:first-child{padding-top:0 !important;margin-top:"+this._firstChildContributingMargin+"px !important;}"+"body > *:last-child{padding-bottom:0 !important;margin-bottom:"+this._lastChildContributingMargin+"px !important;}"+"li > ul:-moz-first-node, li > ol:-moz-first-node{padding-top:1.2em;}\n"+"li{min-height:1.2em;}"+"",this.document);
 dojo.html.removeNode(_8cd);
 this.document.body.innerHTML=html;
 if(_8ca||dojo.render.html.safari){

data/app/assets/javascripts/dojo/src/widget/templates/richtextframe.html

@@ -8,6 +8,9 @@
 		<script type="text/javascript">
 			function init(){
 				document.designMode = 'on';
+				document.execCommand('enableObjectResizing', false, true);
+				document.execCommand('enableInlineTableEditing', false, true);
+				document.execCommand('enableAbsolutePositionEditor', false, true);
 				try{
 					parentPageDomain = document.location.href.split('#')[1];
 					if(parentPageDomain){

data/app/assets/javascripts/imagine_cms/core.js

@@ -83,19 +83,14 @@ function dpNextMonth(object, method_prefix, max_year) {
  ********************************/
 
 var cbNumColumns = 0;
-var cbColWidth = '200px';
-var cbColHeight = '240px';
-var cbBorderWidth = '1px';
-var cbColWidthFull = 202;
+var cbColWidth = 200;
+var cbColHeight = 240;
 
 function cbAddColumn() {
-    var currentWidth = parseInt($('columnBrowser').style.width, 10);
-    // if (currentWidth < ((cbNumColumns+1) * cbColWidthFull)) {
-      $('columnBrowser').style.width = '' + ((cbNumColumns+1) * cbColWidthFull) + 'px';
-      $('columnBrowserContainer').scrollLeft = $('columnBrowserContainer').scrollWidth;
-    // }
-    $('columnBrowser').innerHTML += "<div id=\"columnBrowserLevel" + cbNumColumns + "\" style=\"width: " + cbColWidth + "; height: " + cbColHeight + "; overflow: auto; float: left; border-width: " + cbBorderWidth + " " + cbBorderWidth + " " + cbBorderWidth + " " + (cbNumColumns == 0 ? cbBorderWidth : '0') + "; border-style: solid; border-color: gray;\">Loading...</div>";
+    jQuery('#columnBrowser').append('<div id="columnBrowserLevel' + cbNumColumns + '" class="cb_column">Loading...</div>');
+    jQuery('#columnBrowserContainer').scrollLeft(jQuery('#columnBrowserContainer')[0].scrollWidth);
     cbNumColumns++;
+    jQuery('#columnBrowser').css({ width: '' + ((cbColWidth+1) * cbNumColumns) + 'px' });
 }
 
 function getScrollbarPosition(el) {
@@ -110,31 +105,25 @@ function setScrollbarPosition(el, coords) {
 }
 
 function cbSelectItem(el, currentLevel, urlForNextLevel) {
-    var el = $(el);
-    coords = getScrollbarPosition(el.parentNode);
+    var el = jQuery(el);
+    // coords = getScrollbarPosition(el.parentNode);
     
-    // remove all higher levels and unselect all other same-level divs
+    // remove all higher levels
     for (var i = currentLevel + 1; i <= cbNumColumns; i++) {
-        d = $('columnBrowserLevel' + i);
-        if (d) d.parentNode.removeChild(d);
+        jQuery('#columnBrowserLevel' + i).remove();
     }
     cbNumColumns = currentLevel + 1;
-    
-    prefix = 'cb_item_';
-    $A(el.parentNode.childNodes).each(function (d) {
-        if (d.id && d.id.substring(0, prefix.length) == prefix) {
-            d.className = 'cb_item';
-        }
-    })
-    
-    // select and expand current dept div
-    el.className = 'cb_item cb_item_selected';
-    
+
+    // unselect all other same-level divs and select target
+    // prefix = 'cb_item_';
+    el.siblings().removeClass('cb_item_selected');
+    el.addClass('cb_item_selected');
+
+    // display children
     cbAddColumn();
-    el = $(el.id);
-    new Ajax.Updater('columnBrowserLevel' + (currentLevel+1), urlForNextLevel, {method: 'GET', asynchronous:true, evalScripts:true});
-    
-    setScrollbarPosition(el.parentNode, coords);
+    new Ajax.Updater('columnBrowserLevel' + (currentLevel+1), urlForNextLevel, {method: 'GET', asynchronous: true, evalScripts: true});
+
+    // setScrollbarPosition(el.parentNode, coords);
 }
 
 
@@ -260,7 +249,7 @@ function cancelSelectThumbnail() {
     hideDojoDialog('select_thumbnail_dialog');
 }
 
-var gallerySize = [];
+if (!window.gallerySize) window.gallerySize = {};
 function changeGalleryImage(galleryName, index) {
     var target = galleryName + '_image_' + index;
     var caption = galleryName + '_caption_' + index;
@@ -346,13 +335,15 @@ function closePageBrowser() {
     $(pageBrowserFieldID).value = $('page_browser_selection').value;
 }
 
-
+// first level of this hash is parent_key below
 var cmsPageObjects = {};
+
 function scanForPageObjects(page_id, parent_key, version) {
   if (jQuery('#page_objects_' + parent_key).val().length == 0) return;
-  
+
   var found = {};
-  
+  if (!cmsPageObjects[parent_key]) cmsPageObjects[parent_key] = {};
+
   var regex = /<%=\s*insert_object\(?\s*['"]([-\w\s\d]+)['"],\s*:(\w+)\s*(.*?)\)?\s*%>/gm;
   var matches = jQuery('#page_objects_' + parent_key).val().match(regex);
   if (matches) {
@@ -367,7 +358,7 @@ function scanForPageObjects(page_id, parent_key, version) {
       }
     });
   }
-  
+
   var regex = /<%=\s*(?:page_list|pagelist)\(?\s*['"]([-\w\s\d]+)['"](.*?)\)?\s*%>/gm;
   var matches = jQuery('#page_objects_' + parent_key).val().match(regex);
   if (matches) {
@@ -382,22 +373,22 @@ function scanForPageObjects(page_id, parent_key, version) {
       }
     });
   }
-  
+
   // remove the cruft
   jQuery.each(cmsPageObjects, function(key, val) {
-    if (cmsPageObjects[key] != found[key]) {
+    if (cmsPageObjects[parent_key][key] != found[key]) {
       obj_key = val + '_container_obj-' + val + '-' + key.replace(/[^\w]/g, '_');
       while (jQuery('#' + obj_key).length > 0) {
         jQuery('#' + obj_key).remove();
       }
-      cmsPageObjects[key] = null;
+      cmsPageObjects[parent_key][key] = null;
     }
   });
   
   // bring in the new
   jQuery.each(found, function (key, val) {
-    if (!cmsPageObjects[key]) {
-      cmsPageObjects[key] = val;
+    if (!cmsPageObjects[parent_key][key]) {
+      cmsPageObjects[parent_key][key] = val;
       jQuery.get('/manage/cms_pages/' + page_id + '/insert_page_object_config?version= ' + version +
                  '&name=' + key + '&type=' + val + '&parent_key=' + parent_key);
     }

data/app/assets/stylesheets/imagine_cms.css.scss

@@ -1,3 +1,11 @@
+// fix for a Firefox 69 issue
+.dojoFloatingPane {
+	position: fixed !important;
+	top: 40px;
+	left: 50%;
+	margin-left: -25%;
+}
+
 .search-result {
   margin-bottom: 20px;
   .search-result-title { font-size: 1.1em; }
@@ -37,7 +45,7 @@ a.imagine_cms-paginator-link-selected {
 
 /* an extra classname is applied for Opera < 9.0 to fix it's lack of opacity support */
 .imgCrop_wrap.opera8 .imgCrop_overlay,
-.imgCrop_wrap.opera8 .imgCrop_clickArea { 
+.imgCrop_wrap.opera8 .imgCrop_clickArea {
 	background-color: transparent;
 }
 
@@ -58,7 +66,7 @@ a.imagine_cms-paginator-link-selected {
 
 .imgCrop_selArea {
 	position: absolute;
-	/* @done_in_js 
+	/* @done_in_js
 	top: 20px;
 	left: 20px;
 	width: 200px;
@@ -94,16 +102,16 @@ a.imagine_cms-paginator-link-selected {
 	z-index: 3;
 }
 
-/* 
+/*
  *  FIX MARCHING ANTS IN IE
- *	As IE <6 tries to load background images we can uncomment the follwoing hack 
+ *	As IE <6 tries to load background images we can uncomment the follwoing hack
  *  to remove that issue, not as pretty - but is anything in IE?
  *  And yes I do know that 'filter' is evil, but it will make it look semi decent in IE
  *
 * html .imgCrop_marqueeHoriz,
 * html .imgCrop_marqueeVert {
 	background: transparent;
-	filter: Invert; 
+	filter: Invert;
 }
 * html .imgCrop_marqueeNorth { border-top: 1px dashed #000; }
 * html .imgCrop_marqueeEast  { border-right: 1px dashed #000; }
@@ -143,7 +151,7 @@ a.imagine_cms-paginator-link-selected {
 	cursor: n-resize;
 }
 
-.imgCrop_handleNE { 
+.imgCrop_handleNE {
 	top: -3px;
 	right: -3px;
 	cursor: ne-resize;
@@ -189,7 +197,7 @@ a.imagine_cms-paginator-link-selected {
 }
 
 /**
- * Create an area to click & drag around on as the default browser behaviour is to let you drag the image 
+ * Create an area to click & drag around on as the default browser behaviour is to let you drag the image
  */
 .imgCrop_dragArea {
 	width: 100%;

data/app/assets/stylesheets/imagine_controls.css.scss

@@ -34,13 +34,56 @@ div.auto_complete ul strong.highlight {
 
 
 /** column browser **/
+#columnBrowserContainer {
+    width: 100%; max-height: 90vh;
+    overflow: auto;
+    border: 1px solid gray;
+    border-width: 0 0 0 1px;
+}
+#columnBrowserToolbar {
+    background-color: #ddd;
+    padding: 5px 4px 0;
+    margin: 0 0 5px;
 
+    a {
+        margin-left: 2px;
+    }
+    a:first-child { margin-left: 0; }
+}
+.cb_column {
+    overflow: auto;
+    float: left;
+    border: 1px solid gray;
+    border-width: 1px 1px 1px 0;
+}
 .cb_item {
+    position: relative;
     color: black;
-    padding-left: 2px;
-}
+    padding: 2px;
+    width: calc(100% - 22px);
+    overflow: hidden;
+    float: left;
+    cursor: pointer;
+
+    img { position: absolute; left: 5px; top: 5px; }
+    span {
+        display: block;
+        padding: 2px 0px 2px 20px;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;      
+    }
+  }
 
 .cb_item.cb_item_selected {
     color: white;
     background-color: #506D91;
 }
+
+.cb_item.cb_item_offline {
+    color: gray;
+}
+.cb_item.cb_item_offline.cb_item_selected {
+    color: lightgray;
+}

data/app/controllers/cms/content_controller.rb

@@ -268,7 +268,7 @@ module Cms # :nodoc:
     def rss_feed
       min_time = Time.rfc2822(request.env["HTTP_IF_MODIFIED_SINCE"]) rescue nil
       if min_time && (Time.now - min_time) < 5.minutes
-        render text: '', status: '304 Not Modified' and return
+        render plain: '', status: '304 Not Modified' and return
       end
       
       @@cms_page_table_exists ||= CmsPage.table_exists?
@@ -292,7 +292,7 @@ module Cms # :nodoc:
         
         if min_time && @most_recent_pub_date.published_date && @most_recent_pub_date.published_date <= min_time
           # use cached version
-          render text: '', status: '304 Not Modified' and return
+          render plain: '', status: '304 Not Modified' and return
         end
         
         @pages.each_with_index do |page, index|