refinerycms-core 2.1.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf58cea84fdac90debd361a884885f242a60703c
-  data.tar.gz: 1de2b42f4bd4f6ed609c176e24ffa224c65ef4f4
+  metadata.gz: 90e1c05265241163cb45f678be671e6f47e9c08a
+  data.tar.gz: cf712355daac2a6c825b866573eb7ae3d81bc989
 SHA512:
-  metadata.gz: 37e7d0cba7e5cb96f9a2f1691931f2719efe1a78474ae4e2aa9d536ffd50bac9d513b6ec55af10a0d05a69696ad3340df51860fa5147796dc3c50810827d0d15
-  data.tar.gz: 937395f43f4a8176429ed8ccbc8298ddb8d991b189155a394657c271ff68e463cc1f25fd95147faf5e052bed98ac0f236e3df43e234ac03cc22e2352d79e1ce7
+  metadata.gz: 1ddca26c94421aad545b5a13aac760707d8eb40d1bb74f79b3d64d745f43f072cb1d3db2df7dce2e8f66ecdf7b614960eb886d71197724f3b922ca92516fc8be
+  data.tar.gz: baab49eae1449aba6df2131ee303e916b0f7e2033496ff94621c4173d62977a94b593887c156961eebb23d09abcae3f02b27cb32df83cdd7bfaf555e5b44c2c5

data/app/assets/images/refinery/icons/locale-blue.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="380px" height="380px" viewBox="0 0 380 380" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.1.1 (8761) - http://www.bohemiancoding.com/sketch -->
+    <title>Locale - blue</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="speech_bubble" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="locale" sketch:type="MSLayerGroup" fill="#CDE6FB">
+            <g id="speech_bubble" sketch:type="MSShapeGroup">
+                <path d="M190,323 C323,323 380,266 380,161.5 C380,57 323,1.58224371e-14 190,0 C57,-1.58224371e-14 7.52797591e-15,57 0,161.5 C7.52797622e-15,266 57,323 190,323 L190,323 Z" id="bubble"></path>
+                <path d="M323,280.490927 C323,361 247.741684,380.000008 209,380 C247.741684,342 247.741684,341.999997 247.741683,286.289719 C247.741682,230.579441 323,199.981853 323,280.490927 L323,280.490927 Z" id="tail"></path>
+            </g>
+        </g>
+    </g>
+</svg>

data/app/assets/images/refinery/icons/locale.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="400px" height="400px" viewBox="0 0 400 400" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.1.1 (8761) - http://www.bohemiancoding.com/sketch -->
+    <title>Speech Bubble</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="speech_bubble" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M200,340 C340,340 400,280 400,170 C400,60 340,1.6655197e-14 200,0 C60,-1.6655197e-14 7.92418517e-15,60 0,170 C7.9241855e-15,280 60,340 200,340 Z" id="bubble" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <path d="M340,295.253607 C340,380 260.78072,400.000008 220,400 C260.78072,360 260.78072,359.999997 260.780719,301.357599 C260.780718,242.715201 340,210.507214 340,295.253607 Z" id="tail" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+    </g>
+</svg>

data/app/assets/javascripts/admin.js

@@ -1,6 +1,7 @@
-// Use this to customize the wymeditor boot process
-// Just mirror the options specified in boot_wym.js with the new options here.
-// This will completely override anything specified in boot_wym.js for that key.
-// e.g. skin: 'something_else'
-if (typeof(custom_wymeditor_boot_options) == "undefined") { custom_wymeditor_boot_options = {}; }
-
+// Use this to customize the visual editor boot process
+// Just mirror the options specified in your visual editor's config with the new
+// options here.  This will completely override anything specified in your visual
+// editor's boot process for that key, e.g. skin: 'something_else'
+if (typeof(custom_visual_editor_options) == "undefined") {
+  custom_visual_editor_options = {};
+}

data/app/assets/javascripts/refinery/admin.js.erb

@@ -3,7 +3,7 @@ var initialLoad = true;
 
 init_refinery_admin = function(){
   init_interface();
-  init_sortable_menu();
+  init_flash_messages();
   init_submit_continue();
   init_modal_dialogs();
   init_tooltips();
@@ -33,13 +33,15 @@ $.fn.paginateTo = function(stateUrl) {
       // remove caching _ argument.
       $('.pagination_container .pagination a').each(function(i, a){
         $(this).attr('href', $(this).attr('href').replace(/\?\_\=[^&]+&/, '?'));
-      })
+      });
+
+      init_ajaxy_pagination();
     },
     error: function(data) {
       window.location = popstate_location;
     }
   });
-}
+};
 
 $.fn.slideTo = function(response) {
   $(this).html(response);
@@ -48,7 +50,7 @@ $.fn.slideTo = function(response) {
   init_modal_dialogs();
   init_tooltips();
   return $(this);
-}
+};
 
 $.fn.applyMinimumHeightFromChildren = function() {
   child_heights = 0;
@@ -60,7 +62,7 @@ $.fn.applyMinimumHeightFromChildren = function() {
   });
   $(this).css('min-height', child_heights);
   return $(this);
-}
+};
 
 init_modal_dialogs = function(){
   $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor) {
@@ -94,6 +96,24 @@ init_modal_dialogs = function(){
   });
 };
 
+onOpenDialog = function(dialog) {
+  if ($('.ui-dialog').height() < $(window).height()) {
+    if(iframed()) {
+      $(parent.document.body).addClass('hide-overflow');
+    } else {
+      $(document.body).addClass('hide-overflow');
+    }
+  }
+};
+
+onCloseDialog = function(dialog) {
+  if(iframed()) {
+    $(parent.document.body).removeClass('hide-overflow');
+  } else {
+    $(document.body).removeClass('hide-overflow');
+  }
+};
+
 refinery_dialog_success = function(e) {
   close_dialog();
 
@@ -106,7 +126,7 @@ refinery_dialog_success = function(e) {
       $('#flash_container > #flash').remove();
       $('#flash_container').append($('.pagination_container').find('#flash'));
 
-      $('#flash').css({'width': 'auto', 'visibility': ''}).fadeIn(550);
+      $('#flash').css({'width': 'auto', 'visibility': ''}).show();
       init_refinery_admin();
     }
   });
@@ -116,10 +136,10 @@ trigger_reordering = function(e, enable) {
   $menu = $("#menu");
   e.preventDefault();
   $('#menu_reorder, #menu_reorder_done').toggle();
-  $('#site_bar, #content').fadeTo(500, enable ? 0.35 : 1);
+  $('#site_bar, #content').fadeTo(0, enable ? 0.35 : 1);
 
   if(enable) {
-    $menu.find('.tab a').click(function(ev){
+    $menu.find('.tab a').on('click', function(ev){
       ev.preventDefault();
     });
   } else {
@@ -134,7 +154,7 @@ trigger_reordering_content_section = function(e, enable) {
   e.preventDefault();
   $('#reorder_page_part, #reorder_page_part_done').toggle();
   $('#site_bar, #menu, .field:not(:has(#page-tabs)), .page_part:visible, #more_options_field, .form-actions')
-    .fadeTo(500, enable ? 0.35 : 1);
+    .fadeTo(0, enable ? 0.35 : 1);
 
   $menu.sortable(enable ? 'enable' : 'disable').sortable({
     items: 'li',
@@ -147,16 +167,10 @@ trigger_reordering_content_section = function(e, enable) {
 };
 
 submit_and_continue = function(e, redirect_to) {
-  // ensure wymeditors are up to date.
-  if ($(this).hasClass('wymupdate')) {
-    $.each(WYMeditor.INSTANCES, function(index, wym)
-    {
-      wym.update();
-    });
-  }
+  visual_editor_update();
 
   $('#continue_editing').val(true);
-  $('#flash').fadeOut(250);
+  $('#flash').hide();
 
   $('.fieldWithErrors').removeClass('fieldWithErrors').addClass('field');
   $('#flash_container .errorExplanation').remove();
@@ -168,7 +182,7 @@ submit_and_continue = function(e, redirect_to) {
       if (($flash_container = $('#flash_container')).length > 0) {
         $flash_container.html(data);
 
-        $('#flash').css({'width': 'auto', 'visibility': null}).fadeIn(550);
+        $('#flash').css({'width': 'auto', 'visibility': null}).show();
 
         $('.errorExplanation').not($('#flash_container .errorExplanation')).remove();
 
@@ -186,8 +200,15 @@ submit_and_continue = function(e, redirect_to) {
 
         init_flash_messages();
 
-        //updates the form action with new URL
+        //updates the form action and locale picker links with new URLs
         $('form').attr('action', $('#new_action').attr('value'));
+        $('#switch_locale_picker > li > a').each(function(i, anchor) {
+          ($anchor = $(anchor)).attr('href',
+            $('#new_refinery_edit_page_path').attr('value')
+              + "?switch_locale="
+              + $anchor.attr('href').split('?switch_locale=').slice(-1)[0]
+          );
+        });
       }
     }, 'html'
   );
@@ -206,8 +227,8 @@ init_tooltips = function(args){
           tooltip = $("<div class='tooltip'><div><span></span></div></div>").appendTo('#tooltip_container');
           tooltip.find("span").html($(this).attr('tooltip'));
 
-          tooltip_nib_extension = $.browser.msie ? '.gif' : '.png';
-          nib = $("<img src='<%= asset_path 'refinery/tooltip-nib' %>" + tooltip_nib_extension + "' class='tooltip-nib'/>").appendTo('#tooltip_container');
+          tooltip_nib_image_src = $.browser.msie ? "<%= asset_path 'refinery/tooltip-nib.gif' %>" : "<%= asset_path 'refinery/tooltip-nib.png' %>";
+          nib = $("<img src='" + tooltip_nib_image_src + "' class='tooltip-nib'/>").appendTo('#tooltip_container');
 
           tooltip.css({
             'opacity': 0
@@ -425,14 +446,14 @@ var link_dialog = {
   },
 
   init_close: function(){
-    $('.form-actions-dialog #cancel_button').not('.wym_iframe_body .form-actions-dialog #cancel_button').click(close_dialog);
+    $('.form-actions-dialog #cancel_button').not('.visual_editor_iframe_body .form-actions-dialog #cancel_button').click(close_dialog);
 
     if (parent
         && parent.document.location.href != document.location.href
-        && parent.document.getElementById('wym_dialog_submit') != null) {
+        && parent.document.getElementById('visual_editor_dialog_submit') != null) {
       $('#dialog_container .form-actions input#submit_button').click(function(e) {
         e.preventDefault();
-        $(parent.document.getElementById('wym_dialog_submit')).click();
+        $(parent.document.getElementById('visual_editor_dialog_submit')).click();
       });
       $('#dialog_container .form-actions a.close_dialog').click(close_dialog);
     }
@@ -502,14 +523,14 @@ var link_dialog = {
 
   update_parent: function(url, title, target) {
     if (parent != null) {
-      if ((wym_href = parent.document.getElementById('wym_href')) != null) {
-        wym_href.value = url;
+      if ((visual_editor_href = parent.document.getElementById('visual_editor_href')) != null) {
+        visual_editor_href.value = url;
       }
-      if ((wym_title = parent.document.getElementById('wym_title')) != null) {
-        wym_title.value = title;
+      if ((visual_editor_title = parent.document.getElementById('visual_editor_title')) != null) {
+        visual_editor_title.value = title;
       }
-      if ((wym_target = parent.document.getElementById('wym_target')) != null) {
-        wym_target.value = target || "";
+      if ((visual_editor_target = parent.document.getElementById('visual_editor_target')) != null) {
+        visual_editor_target.value = target || "";
       }
     }
   }
@@ -520,7 +541,7 @@ var page_options = {
   , init: function(enable_parts, new_part_url, del_part_url){
 
     if (!this.initialised) {
-      // set the page tabs up, but ensure that all tabs are shown so that when wymeditor loads it has a proper height.
+      // set the page tabs up, but ensure that all tabs are shown so that when the visual editor loads it has a proper height.
       page_options.tabs = $('#page-tabs').tabs();
 
       part_shown = $('#page-tabs .page_part.field').not('.ui-tabs-hide');
@@ -555,13 +576,17 @@ var page_options = {
   },
 
   page_part_dialog: function(){
+    var slugOptions = {
+      separator: '_'
+    }
+
     $('#new_page_part_dialog').dialog({
       title: 'Create Content Section',
       modal: true,
       resizable: false,
       autoOpen: false,
       width: 600,
-      height: 200
+      height: 300
     });
 
     $('#add_page_part').click(function(e){
@@ -569,25 +594,36 @@ var page_options = {
       $('#new_page_part_dialog').dialog('open');
     });
 
+    $('#new_page_part_title').on('input propertychange', function() {
+      var part_title = $(this).val();
+
+      if(part_title.length > 0) {
+        var part_slug = getSlug(part_title, slugOptions);
+        $('#new_page_part_slug').val(part_slug);
+      }
+    });
+
     $('#new_page_part_save').click(function(e){
       e.preventDefault();
 
       var part_title = $('#new_page_part_title').val();
+      var part_slug = $('#new_page_part_slug').val();
 
-      if(part_title.length > 0){
-        var tab_title = part_title.toLowerCase().replace(" ", "_");
+      if(part_slug.length > 0){
+        var tab_slug = getSlug(part_slug, slugOptions);
 
-        if ($('#page_part_' + tab_title).size() === 0) {
+        if ($('#page_part_' + tab_slug).size() === 0) {
           $.get(page_options.new_part_url, {
-              title: part_title
-              , part_index: $('#new_page_part_index').val()
-              , body: ''
+              title: part_title,
+              part_index: $('#new_page_part_index').val(),
+              slug: tab_slug,
+              body: ''
             }, function(data, status){
               $('#submit_continue_button').remove();
               // Add a new tab for the new content section.
               $('#page_part_editors').append(data);
 
-              page_options.tabs.find("ul").append("<li><a href='#page_part_new_"+$('#new_page_part_index').val()+"'>"+part_title+"</a></li>");
+              page_options.tabs.find("ul#page_parts").append("<li><a href='#page_part_new_"+$('#new_page_part_index').val()+"'>"+part_title+"</a></li>");
               page_options.tabs.tabs("refresh");
 
               // this is here because of https://github.com/refinery/refinerycms/issues/2060
@@ -595,20 +631,21 @@ var page_options = {
 
               page_options.tabs.tabs("option", "active", -1);
 
-              WYMeditor.init();
+              visual_editor_init();
 
               // Wipe the title and increment the index counter by one.
               $('#new_page_part_index').val(parseInt($('#new_page_part_index').val(), 10) + 1);
               $('#new_page_part_title').val('');
+              $('#new_page_part_slug').val('');
 
               $('#new_page_part_dialog').dialog('close');
             }, 'html'
           );
         }else{
-          alert("A content section with that title already exists, please choose another.");
+          alert("A content section with that slug already exists, please choose another.");
         }
       }else{
-        alert("You have not entered a title for the content section, please enter one.");
+        alert("You have not entered a slug for the content section, please enter one.");
       }
     });
 
@@ -616,6 +653,7 @@ var page_options = {
       e.preventDefault();
       $('#new_page_part_dialog').dialog('close');
       $('#new_page_part_title').val('');
+      $('#new_page_part_slug').val('');
     });
 
     $('#delete_page_part').click(function(e){
@@ -654,7 +692,8 @@ var page_options = {
 
 };
 
-// TODO:  Need to rewrite WYM to accept multiple images. As it stands, only
+// TODO:  Need to rewrite the visual editors to accept multiple images.
+//        As it stands, only
 //        the callback is useful when inserting multiple -- helpful for
 //        the page-images and portfolio engines.
 
@@ -725,18 +764,18 @@ function ImageDialog(options) {
       image_url = resize ? img.attr('data-' + size) : img.attr('data-original');
 
       if (parent) {
-        if ((wym_src = parent.document.getElementById('wym_src')) != null) {
-          wym_src.value = image_url;
+        if ((visual_editor_src = parent.document.getElementById('visual_editor_src')) != null) {
+          visual_editor_src.value = image_url;
         }
-        if ((wym_title = parent.document.getElementById('wym_title')) != null) {
-          wym_title.value = img.attr('title');
+        if ((visual_editor_title = parent.document.getElementById('visual_editor_title')) != null) {
+          visual_editor_title.value = img.attr('title');
         }
-        if ((wym_alt = parent.document.getElementById('wym_alt')) != null) {
-          wym_alt.value = img.attr('alt');
+        if ((visual_editor_alt = parent.document.getElementById('visual_editor_alt')) != null) {
+          visual_editor_alt.value = img.attr('alt');
         }
-        if ((wym_size = parent.document.getElementById('wym_size')) != null
+        if ((visual_editor_size = parent.document.getElementById('visual_editor_size')) != null
             && typeof(geometry) != 'undefined') {
-          wym_size.value = geometry.replace(/[<>=]/g, '');
+          visual_editor_size.value = geometry.replace(/[<>=]/g, '');
         }
       }
     }
@@ -756,14 +795,14 @@ function ImageDialog(options) {
   };
 
   this.init_actions = function() {
-    // get submit buttons not inside a wymeditor iframe
+    // get submit buttons not inside a visual editor iframe
     $('#existing_image_area .form-actions-dialog #submit_button')
-      .not('.wym_iframe_body #existing_image_area .form-actions-dialog #submit_button')
+      .not('.visual_editor_iframe_body #existing_image_area .form-actions-dialog #submit_button')
       .click($.proxy(self.submit_image_choice, self));
 
-    // get cancel buttons not inside a wymeditor iframe
+    // get cancel buttons not inside a visual editor iframe
     $('.form-actions-dialog #cancel_button')
-      .not('.wym_iframe_body .form-actions-dialog #cancel_button')
+      .not('.visual_editor_iframe_body .form-actions-dialog #cancel_button')
       .click($.proxy(close_dialog, self));
 
     $('#existing_image_size_area ul li a').click(function(e) {
@@ -783,10 +822,10 @@ function ImageDialog(options) {
       }
     });
 
-    image_area = $('#existing_image_area').not('#wym_iframe_body #existing_image_area');
+    image_area = $('#existing_image_area').not('#visual_editor_iframe_body #existing_image_area');
     image_area.find('.form-actions input#submit_button').click($.proxy(function(e) {
       e.preventDefault();
-      $(this.document.getElementById('wym_dialog_submit')).click();
+      $(this.document.getElementById('visual_editor_dialog_submit')).click();
     }, parent));
     image_area.find('.form-actions a.close_dialog').click(close_dialog);
   };
@@ -852,7 +891,7 @@ var image_picker = {
     this.image.src = $(this.image).attr('data-' + size);
     current_image = $(this.container).find(this.picker.options.image_display);
     current_image.replaceWith(
-      $("<img src='"+this.image.src+"?"+Math.floor(Math.random() * 100000)+"' id='"+current_image.attr('id')+"' class='"+this.picker.options.image_display.replace(/^./, '')+" brown_border' />")
+      $("<img src='"+this.image.src+"' id='"+current_image.attr('id')+"' class='"+this.picker.options.image_display.replace(/^./, '')+" brown_border' />")
     );
 
     $(this.container).find(this.picker.options.remove_image_button).show();
@@ -885,8 +924,8 @@ close_dialog = function(e) {
     the_dialog.remove();
   }
 
-  // if there's a wymeditor involved don't try to close the dialog as wymeditor will.
-  if (!$(document.body).hasClass('wym_iframe_body')) {
+  // if there's a visual editor involved don't try to close the dialog as visual editor will.
+  if (!$(document.body).hasClass('visual_editor_iframe_body')) {
     the_body.removeClass('hide-overflow');
     the_dialog.filter(':data(dialog)').dialog('close');
     the_dialog.remove();