Recompile plone bundles, after plone/mockup#863, fixing #2512

changelog

CHANGES.rst

@@ -56,6 +56,9 @@ Bug fixes:
   JS worked only when coming from Plone detailed search page.
   [jensens]
 
+- Fix Datatables CSS not available #2512 via PR mockup #863
+  [sunew, thet]
+
 
 5.1.3 (2018-06-22)
 ------------------

Products/CMFPlone/profiles/dependencies/registry.xml

@@ -1071,7 +1071,7 @@
       <value key="js">++plone++static/components/jquery.recurrenceinput.js/lib/jquery.tmpl.js</value>
       <value key="deps">jquery</value>
   </records>
-  
+
 <!-- legacy js -->
   <record name="plone.resources.last_legacy_import">
     <field type="plone.registry.field.Datetime">
@@ -1171,7 +1171,7 @@
     <value key="enabled">True</value>
     <value key="jscompilation">++plone++static/plone-compiled.min.js</value>
     <value key="csscompilation">++plone++static/plone-compiled.css</value>
-    <value key="last_compilation">2018-07-10 00:00:00</value>
+    <value key="last_compilation">2018-09-14 13:00:00</value>
     <value key="stub_js_modules">
       <element>jquery</element>
     </value>
@@ -1187,7 +1187,7 @@
     <value key="expression">python: member is not None</value>
     <value key="jscompilation">++plone++static/plone-logged-in-compiled.min.js</value>
     <value key="csscompilation">++plone++static/plone-logged-in-compiled.css</value>
-    <value key="last_compilation">2018-07-24 00:00:00</value>
+    <value key="last_compilation">2018-09-14 13:00:00</value>
     <value key="depends">plone</value>
     <value key="stub_js_modules">
       <element>backbone</element>
@@ -1228,7 +1228,7 @@
     <value key="depends">plone</value>
     <value key="jscompilation">++plone++static/plone-legacy-compiled.js</value>
     <value key="csscompilation">++plone++static/plone-legacy-compiled.css</value>
-    <value key="last_compilation">2017-08-30 15:33:00</value>
+    <value key="last_compilation">2018-09-14 13:00:00</value>
     <value key="compile">False</value>
     <value key="enabled">True</value>
   </records>
@@ -1241,7 +1241,7 @@
     <value key="enabled">False</value>
     <value key="jscompilation">++plone++static/resourceregistry-compiled.min.js</value>
     <value key="csscompilation">++plone++static/resourceregistry-compiled.css</value>
-    <value key="last_compilation">2017-11-14 15:33:00</value>
+    <value key="last_compilation">2018-09-14 13:00:00</value>
     <value key="stub_js_modules">
       <element>jquery</element>
     </value>

Products/CMFPlone/static/plone-compiled.js

@@ -19107,5 +19107,5 @@ require([
 
 });
 
-define("/trabajo/plone/buildout.coredev/src/Products.CMFPlone/Products/CMFPlone/static/plone.js", function(){});
+define("/work/playground/plone/plone.coredev-5.1/src/Products.CMFPlone/Products/CMFPlone/static/plone.js", function(){});
 

Products/CMFPlone/static/plone-logged-in-compiled.js

@@ -26212,7 +26212,7 @@ define('mockup-patterns-tooltip',[
 
   bootstrapTooltip.DEFAULTS = {
     animation: true,
-    placement: 'top',
+    placement: 'auto',
     selector: false,
     template: '<div class="tooltip mockup-tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
     trigger: 'hover focus',
@@ -68391,7 +68391,7 @@ define('mockup-patterns-structure-url/js/views/tablerow',[
 });
 
 
-define('text!mockup-patterns-structure-url/templates/table.xml',[],function () { return '<div class="alert alert-<%- status.type %> status">\n  <strong><%- status.label %></strong>\n  <span><%- status.text %></span>&nbsp;<% // &nbsp; to get correct height for empty alerts %>\n</div>\n\n<table class="pat-datatables table table-striped table-bordered"\n       data-pat-datatables="<%- datatables_options %>">\n  <thead>\n    <tr class="fc-breadcrumbs-container">\n      <td class="fc-breadcrumbs" colspan="<%- activeColumns.length + 3 %>">\n        <a href="#" data-path="/">\n          <span class="glyphicon glyphicon-home"></span> /\n        </a>\n        <% _.each(pathParts, function(part, idx, list){\n          if(part){\n            if(idx > 0){ %>\n              /\n            <% } %>\n            <a href="#" class="crumb" data-path="<%- part %>"><%- part %></a>\n          <% }\n        }); %>\n      </td>\n    </tr>\n    <tr>\n      <th class="selection"><input type="checkbox" class="select-all" /></th>\n      <th class="title"><%- _t(\'Title\') %></th>\n      <% _.each(activeColumns, function(column){ %>\n        <% if(column !== \'Description\' && _.has(availableColumns, column)) { %>\n          <th><%- availableColumns[column] %></th>\n        <% } %>\n      <% }); %>\n      <th class="actions"><%- _t("Actions") %></th>\n    </tr>\n  </thead>\n  <tbody>\n  </tbody>\n</table>\n';});
+define('text!mockup-patterns-structure-url/templates/table.xml',[],function () { return '<div class="alert alert-<%- status.type %> status">\n  <strong><%- status.label %></strong>\n  <span><%- status.text %></span>&nbsp;<% // &nbsp; to get correct height for empty alerts %>\n</div>\n\n<div class="fc-breadcrumbs-container">\n  <div class="fc-breadcrumbs" colspan="<%- activeColumns.length + 3 %>">\n    <a href="#" data-path="/">\n      <span class="glyphicon glyphicon-home"></span> /\n    </a>\n    <% _.each(pathParts, function(part, idx, list){\n      if(part){\n        if(idx > 0){ %>\n          /\n        <% } %>\n        <a href="#" class="crumb" data-path="<%- part %>"><%- part %></a>\n      <% }\n    }); %>\n  </div>\n</div>\n\n<table class="pat-datatables table table-striped table-bordered"\n       data-pat-datatables="<%- datatables_options %>">\n  <thead>\n    <tr>\n      <th class="selection"><input type="checkbox" class="select-all" /></th>\n      <th class="title"><%- _t(\'Title\') %></th>\n      <% _.each(activeColumns, function(column){ %>\n        <% if(column !== \'Description\' && _.has(availableColumns, column)) { %>\n          <th><%- availableColumns[column] %></th>\n        <% } %>\n      <% }); %>\n      <th class="actions"><%- _t("Actions") %></th>\n    </tr>\n  </thead>\n  <tbody>\n  </tbody>\n</table>\n';});
 
 /*! DataTables 1.10.16
  * ©2008-2017 SpryMedia Ltd - datatables.net/license
@@ -84915,7 +84915,7 @@ define('mockup-patterns-structure-url/js/views/table',[
       var self = this;
 
       // By default do not start sorted by any column
-      // Ignore first column and the last one (activeColumns.length + 2)
+      // Ignore first column and the last one (activeColumns.length + 1)
       // Do not show paginator, search or information, we only want column sorting
       var datatables_options = {
         "aaSorting": [],
@@ -84991,7 +84991,7 @@ define('mockup-patterns-structure-url/js/views/table',[
                     // Clear the status message
                     self.app.setStatus();
                   });
-        self.app.setStatus(_t('Can not drag and drop items to reorder while manually sorting a column'), 'warning', btn = btn);
+        self.app.setStatus(_t('Notice: Drag and drop reordering is disabled when viewing the contents sorted by a column.'), 'warning', btn = btn);
         $(".pat-datatables tbody").find('tr').off("drag")
         self.$el.removeClass('order-support');
       } );
@@ -85037,7 +85037,7 @@ define('mockup-patterns-structure-url/js/views/table',[
       var self = this;
       // if we have a custom query going on, we do not allow sorting.
       if (self.app.inQueryMode()) {
-        self.app.setStatus({text: _t('Can not order items while querying'), type: 'warning'});
+        self.app.setStatus({text: _t('Cannot order items while querying'), type: 'warning'});
         self.$el.removeClass('order-support');
         return;
       }
@@ -87910,8 +87910,7 @@ define('mockup-patterns-structure',[
       contextInfoUrl: null, // for add new dropdown and other info
       setDefaultPageUrl: null,
       menuOptions: null, // default action menu options per item.
-      // default menu generator
-      menuGenerator: 'mockup-patterns-structure-url/js/actionmenu',
+      menuGenerator: 'mockup-patterns-structure-url/js/actionmenu',  // default menu generator
       backdropSelector: '.plone-modal', // Element upon which to apply backdrops used for popovers
 
       activeColumnsCookie: 'activeColumns',
@@ -88003,29 +88002,37 @@ define('mockup-patterns-structure',[
 
       buttons: null,
       _default_buttons: [{
+        tooltip: 'Cut',
         title: 'Cut',
         url: '/cut'
       },{
+        tooltip: 'Copy',
         title: 'Copy',
         url: '/copy'
       },{
+        tooltip: 'Paste',
         title: 'Paste',
         url: '/paste'
       },{
+        tooltip: 'Delete',
         title: 'Delete',
         url: '/delete',
         context: 'danger',
         icon: 'trash'
       },{
+        tooltip: 'Workflow',
         title: 'Workflow',
         url: '/workflow'
       },{
+        tooltip: 'Tags',
         title: 'Tags',
         url: '/tags'
       },{
+        tooltip: 'Properties',
         title: 'Properties',
         url: '/properties'
       },{
+        tooltip: 'Rename',
         title: 'Rename',
         url: '/rename'
       }],
@@ -92889,5 +92896,5 @@ require([
   'use strict';
 });
 
-define("/home/nicola/workspace/plone-test/src/Products.CMFPlone/Products/CMFPlone/static/plone-logged-in.js", function(){});
+define("/work/playground/plone/plone.coredev-5.1/src/Products.CMFPlone/Products/CMFPlone/static/plone-logged-in.js", function(){});
 

Products/CMFPlone/static/resourceregistry-compiled.js

@@ -5146,7 +5146,13 @@ define('mockup-i18n',[
     if (!self.baseUrl) {
       self.baseUrl = '/plonejsi18n';
     }
-    self.currentLanguage = $('html').attr('lang') || 'en-us';
+    self.currentLanguage = $('html').attr('lang') || 'en';
+
+    // Fix for country specific languages
+    if (self.currentLanguage.split('-').length > 1) {
+      self.currentLanguage = self.currentLanguage.split('-')[0] + '_' + self.currentLanguage.split('-')[1].toUpperCase();
+    }
+
     self.storage = null;
     self.catalogs = {};
     self.ttl = 24 * 3600 * 1000;
@@ -5649,7 +5655,7 @@ define('mockup-utils',[
   };
 
   var parseBodyTag = function(txt) {
-    return $((/<body[^>]*>((.|[\n\r])*)<\/body>/im).exec(txt)[0]
+    return $((/<body[^>]*>[^]*<\/body>/im).exec(txt)[0]
       .replace('<body', '<div').replace('</body>', '</div>')).eq(0).html();
   };
 
@@ -5681,7 +5687,23 @@ define('mockup-utils',[
   };
 
   var removeHTML = function(val) {
-    return val.replace(/<[^>]+>/ig, "");
+    return val.replace(/<[^>]+>/ig, '');
+  };
+
+  var storage = {
+    // Simple local storage wrapper, which doesn't break down if it's not available.
+    get: function (name) {
+        if (window.localStorage) {
+          var val = window.localStorage[name];
+          return typeof(val) === 'string' ? JSON.parse(val) : undefined;
+      }
+    },
+
+    set: function (name, val) {
+      if (window.localStorage) {
+        window.localStorage[name] = JSON.stringify(val);
+      }
+    }
   };
 
   return {
@@ -5696,7 +5718,8 @@ define('mockup-utils',[
     loading: new Loading(),  // provide default loader
     parseBodyTag: parseBodyTag,
     QueryHelper: QueryHelper,
-    setId: setId
+    setId: setId,
+    storage: storage
   };
 });
 
@@ -30325,8 +30348,8 @@ define('mockup-patterns-resourceregistry-url/js/overrides',[
           '<% if(view.editing){ %>' +
             '<p class="resource-name text-primary"><%- view.editing %></p> ' +
             '<div class="plone-btn-group">' +
-              '<button class="plone-btn plone-btn-primary plone-btn-xs disabled"><%- _t("Save") %></button> ' +
-              '<button class="plone-btn plone-btn-default plone-btn-xs disabled"><%- _t("Cancel") %></button>' +
+              '<button class="plone-btn plone-btn-primary plone-btn-xs" disabled><%- _t("Save") %></button> ' +
+              '<button class="plone-btn plone-btn-default plone-btn-xs" disabled><%- _t("Cancel") %></button>' +
               '<button class="plone-btn plone-btn-danger plone-btn-xs"><%- _t("Delete customizations") %></button>' +
             '</div>' +
           '<% } %>' +
@@ -32230,7 +32253,7 @@ define('mockup-patterns-modal',[
             } else if (options.onError) {
               options.onError(xhr, textStatus, errorStatus);
             } else {
-              window.alert(_t('There was an error submitting the form.'));
+              // window.alert(_t('There was an error submitting the form.'));
               console.log('error happened do something');
             }
             self.emit('formActionError', [xhr, textStatus, errorStatus]);
@@ -32575,8 +32598,9 @@ define('mockup-patterns-modal',[
       self.$wrapper.addClass('image-modal');
       var src = self.$el.attr('href');
       var srcset = self.$el.attr('data-modal-srcset') || '';
+      var title = $.trim(self.$el.context.innerText) || 'Image';
       // XXX aria?
-      self.$raw = $('<div><h1>Image</h1><div id="content"><div class="modal-image"><img src="' + src + '" srcset="' + srcset + '" /></div></div></div>');
+      self.$raw = $('<div><h1>' + title + '</h1><div id="content"><div class="modal-image"><img src="' + src + '" srcset="' + srcset + '" /></div></div></div>');
       self._show();
     },
 
@@ -32801,9 +32825,6 @@ define('mockup-patterns-modal',[
       self.$modal.addClass(self.options.templateOptions.classActiveName);
       registry.scan(self.$modal);
       self.positionModal();
-      $('img', self.$modal).load(function() {
-        self.positionModal();
-      });
       $(window.parent).on('resize.plone-modal.patterns', function() {
         self.positionModal();
       });
@@ -34149,5 +34170,5 @@ require([
   'use strict';
 });
 
-define("/trabajo/plone/buildout.coredev/src/Products.CMFPlone/Products/CMFPlone/static/resourceregistry.js", function(){});
+define("/work/playground/plone/plone.coredev-5.1/src/Products.CMFPlone/Products/CMFPlone/static/resourceregistry.js", function(){});