browsercms 4.0.0.alpha → 4.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 823840598ca36d83107fe20da64f6385708fc561
-  data.tar.gz: 14697d04fda45494e9b9f251423b0c2b932f4408
+  metadata.gz: 980ba0416e629ef492f4df18bc1900a124c0da63
+  data.tar.gz: ca6fa881df98da38d65317d1b3dba252aafe3967
 SHA512:
-  metadata.gz: dd83ce37f9b57de888b0dba23da366a13465d3170aceaa0e105e840d04167fddbc88a7d5556cba108af66cc45f8d2de810f095d358bb0240d687a6783ab19d62
-  data.tar.gz: 72a6338860e4222696725d10f314b4338b0a77c22e18f3f686bc04e81498c674f7d0e507fc0495c5c675fc78fec529cb980e1fdaac327d8899cc8f8f76bdff6b
+  metadata.gz: b5cd4fc8aa08543d97a95fc3b2e116eee8b2e0a9e68af42272054670b804fbc4c9b9a61b991cff5c82b4c6c673d18ba575c53f7938404c8bb2234c0218ab0b34
+  data.tar.gz: 61c8168049b056485dd0da0e007d685edf03e84dfd269aee17553f03454562f6d0d5436672848fcf50bdaefc313ca7afba533480744244ca26c26a866738f076

data/app/assets/javascripts/bcms/ckeditor.js

@@ -4,4 +4,5 @@
 //
 //= require ckeditor-jquery
 //= require bcms/ckeditor_load
+//= require bcms/ckeditor_standard_config
 

data/app/assets/javascripts/bcms/{ckeditor_load.js.erb → ckeditor_load.js}

@@ -41,7 +41,10 @@ function toggleEditor(id, status) {
 function loadEditor(id) {
     if (typeof(CKEDITOR) != "undefined") {
         if (CKEDITOR.instances[id] == null) {
-            CKEDITOR.replace(id, { customConfig:'<%= asset_path(Rails.application.config.cms.ckeditor.configuration_file) %>' });
+            editor = CKEDITOR.replace(id);
+            editor.config.toolbar = 'Standard';
+            editor.config.width = '100%';
+            editor.config.height = 400;
         }
         $.cookie('editorEnabled', true, { expires:90, path:'/' });
         return true;

data/app/assets/javascripts/bcms/ckeditor_standard_config.js

@@ -3,20 +3,8 @@
 // As per http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.customConfig using a custom config
 // avoids the need to 'mask' the core default config.js file that CKEDITOR comes packaged with.
 
-CKEDITOR.config.toolbar_CMS = [
+CKEDITOR.config.toolbar_Standard = [
   ['Source','-','Cut','Copy','Paste','PasteText','PasteFromWord','-','SpellChecker','Scayt','-','Undo','Redo','Find','Replace','RemoveFormat','-','NumberedList','BulletedList','Outdent','Indent','HorizontalRule'],
   '/',
   ['Link','Unlink','Anchor','Image','Table','SpecialChar','-','Bold','Italic','Underline','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','TextColor','Styles']
 ];
-
-CKEDITOR.config.toolbar_CMSForms = [
-	['Source','-','Cut','Copy','Paste','PasteText','PasteFromWord','-','SpellChecker','Scayt','-','Undo','Redo','Find','Replace','RemoveFormat','-','NumberedList','BulletedList','Outdent','Indent','HorizontalRule'],
-  '/',
-	['Link','Unlink','Anchor','Image','Table','SpecialChar','Bold','Italic','Underline','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','TextColor','Styles'],
-	'/',
-	['TextField','Select','Checkbox','Radio','Textarea','Button','ImageButton','HiddenField']
-];
-
-CKEDITOR.config.width = '100%';
-CKEDITOR.config.height = 400;
-CKEDITOR.config.toolbar = 'CMS';

data/app/assets/javascripts/cms/application.js

@@ -9,6 +9,7 @@
 //= require jquery.taglist
 //= require jquery.ui.all
 //= require cms/core_library
+//= require cms/content_types
 //= require cms/attachment_manager
 //= require cms/form_builder
 //= require cms/sitemap

data/app/assets/javascripts/cms/{attachment_manager.js.erb → attachment_manager.js}

@@ -3,12 +3,11 @@
 $(function () {
     $.cms.AttachmentManager = {
         upload:function (file) {
-            var assetName = $('#asset_types').val()
+            var assetName = $('#attachment_attachable_type').val()
                     , attachableClass = $('#asset_attachable_class').val()
-                    , attachableIDField = $('#asset_attachable_id')
-                    , attachableID = attachableIDField.val()
+//                    , attachableIDField = $('#asset_attachable_id')
+                    , attachableID = $('#asset_attachable_id').val()
                     , file = $('#asset_add_file')
-                    , clone = file.clone()
                     , form = $('<form target="asset_add_uploader" method="post" action="/cms/attachments" enctype="multipart/form-data" style="visibility:hidden">')
                     , fields = '';
 
@@ -21,21 +20,24 @@ $(function () {
             $('body').append(form);
             form.append(fields);
             form.append(file);
-            attachableIDField.after(clone);
+            $('label[for="asset_add_file"]').after(file.clone());
 
             var inp = $('<input type="file" name="attachment[data]" id="asset_add_file" onchange="$.cms.AttachmentManager.upload(this)" />');
 
-            clone.after($('<img>')
-                    .css({position:'static', margin:'5px 0 0 5px', 'verticalAlign':'middle'})
-                    .attr({'id':'file-asset-uploader', 'src':'<%= asset_path 'cms/file-uploading.gif' %>'}));
-            clone.replaceWith(inp);
-
             form.submit();
 
-            $('div.buttons').hide();
-
+            $('#upload-attachment').modal('hide');
+        },
+        enableDeleteButtons:function(){
+          // Handle delete attachment button
+          var delete_attachments_btns = $("a[data-purpose='delete-attachment']");
+          if(delete_attachments_btns.exists()){
+              delete_attachments_btns.off('click').on('click', function(){
+                  var id = $(this).data('id');
+                  $.cms.AttachmentManager.destroy(id);
+              });
+          }
         },
-
         // @param [Integer] id The id of the attachment to delete.
         destroy:function (id) {
             if (confirm("Are you sure want to delete this attachment?")) {
@@ -78,5 +80,9 @@ $(function () {
             $('#assets_table > table').append(asset).show();
             $('div.buttons').show();
         }
+        $('.empty-row').hide();
+        $.cms.AttachmentManager.enableDeleteButtons();
     });
+
+  $.cms.AttachmentManager.enableDeleteButtons();
 });

data/app/assets/javascripts/cms/content_types.js

@@ -0,0 +1,13 @@
+// Adds AJAX behavior primarily for List Portlet
+
+jQuery(function($){
+  var select_tag = $('*[data-role="content_type_selector"]');
+  var order_field = $('*[data-role="order-fields"]');
+  if(select_tag.exists()){
+    select_tag.on('change', function(){
+      var selected_option = $( this ).val();
+      console.log("Changed to", selected_option );
+      order_field.load( '/cms/content_types.js .load > .select', { "content_type": selected_option } )
+    });
+  }
+});

data/app/assets/javascripts/cms/core_library.js.erb

@@ -113,7 +113,7 @@ jQuery(function($) {
 // .slug-dest - The input field to set the slug value in.
 //   @options data-prefix An optional prefix (on slug-dest) that should be added in front of autogenerated slugs
 //      (i.e. <input class='slug-dest' data-prefix="/products" />)
-$(function() {
+jQuery(function($){
     if ($('.slug-dest').length && $('.slug-source').length) {
         $('.slug-source').keyup(function() {
             var name = $('.slug-source').val();
@@ -134,14 +134,14 @@ $(function() {
 });
 
 // Automatically enable date_picker controls
-$(function() {
+jQuery(function($){
     if ($.datepicker) {
         $('input.date_picker').datepicker({ changeFirstDay: false, changeMonth: true, changeYear: true, closeText: '', showButtonPanel: true, dateFormat: '<%= Cms::DatePicker.jquery_format %>' });
     }
 });
 
 // UI Enhancement to suggest paths for uploaded files
-$(function() {
+jQuery(function($){
     var path_input = $('.suggest_file_path');
     if (path_input.length) {
         $('select[data-purpose=section_selector], input[data-purpose=cms_file_field]').change(function() {

data/app/assets/javascripts/cms/form_builder.js

@@ -241,7 +241,7 @@ FormBuilder.prototype.setupConfirmationBehavior = function() {
 var formBuilder = new FormBuilder();
 
 // Register FormBuilder handlers on page load.
-$(function() {
+jQuery(function($){
   formBuilder.setup();
 
 

data/app/assets/javascripts/cms/page_editor.js

@@ -1,15 +1,17 @@
+//= require 'jquery'
 //= require 'jquery_ujs'
 //= require 'cms/core_library'
 //= require 'bootstrap/modal'
-//= require 'ckeditor-jquery'
+//= require 'bcms/ckeditor'
+//= require 'bcms/ckeditor_inline'
 //= require 'cms/ajax'
 
 // Since we are within the page editing iframe, add a 'target=_top' to all links so they refresh the entire page.
-$(function() {
+jQuery(function($){
   $('a').attr('target', '_top');
 });
 
-$(function() {
+jQuery(function($){
   $.cms_editor = {
     // Returns the widget that a user has currently selected.
     // @return [JQuery.Element]
@@ -102,7 +104,7 @@ $(function() {
         content: {}
       };
       message["content"][attribute] = data;
-      var path = '/cms/inline_content/' + content_name + "/" + content_id;
+      var path = '/cms/inline_content/' + content_id + "?content_name=" + content_name;
 
       $.cms_ajax.put({
         url: path,
@@ -121,7 +123,7 @@ $(function() {
 });
 
 // On Ready
-$(function() {
+jQuery(function($){
 
   // Click the 'Add Content' button (PLUS) when editing content.
   $('.cms-add-content').click(function() {
@@ -136,7 +138,6 @@ $(function() {
   $("#page_title").each(function() {
     var id = $(this).attr('id');
     CKEDITOR.inline(id, {
-      customConfig: '/assets/bcms/ckeditor_inline.js',
       toolbar: 'page_title',
       on: {
         blur: function(event) {
@@ -149,8 +150,7 @@ $(function() {
   // Create editors for each content-block on the page.
   $(".content-block").each(function() {
     var id = $(this).attr('id');
-    CKEDITOR.inline(id, {
-      customConfig: '/assets/bcms/ckeditor_inline.js',
+    editor = CKEDITOR.inline(id, {
       toolbar: 'inline',
       on: {
         blur: function(event) {
@@ -158,6 +158,7 @@ $(function() {
         }
       }
     });
+
   });
 
 

data/app/assets/javascripts/cms/sitemap.js

@@ -95,7 +95,7 @@ Sitemap.prototype.open = function(row, options) {
   options = options || {}
   _.defaults(options, {animate: true});
   this.changeIcon(row, 'icon-folder-open');
-  var siblings = row.siblings('ul.nav');
+  var siblings = row.siblings('.children');
   if (options.animate) {
     siblings.slideToggle();
   }
@@ -114,7 +114,7 @@ Sitemap.prototype.attemptOpen = function(row, options) {
 
 Sitemap.prototype.close = function(row) {
   this.changeIcon(row, 'icon-folder');
-  row.siblings('ul.nav').slideToggle();
+  row.siblings('.children').slideToggle();
   this.saveAsClosed(row.data('id'));
 };
 
@@ -138,7 +138,7 @@ Sitemap.prototype.updateDepth = function(element, newDepth) {
 var sitemap = new Sitemap();
 
 // Enable dragging of items around the sitemap.
-$(function() {
+jQuery(function($){
   if ($('#sitemap').exists()) {
 
     $('#sitemap .draggable').draggable({
@@ -188,7 +188,7 @@ $(function() {
 });
 
 // Open/close folders when rows are clicked.
-$(function() {
+jQuery(function($){
   // Ensure this only loads on sitemap page.
   if ($('#sitemap').exists()) {
     sitemap.restoreOpenState();
@@ -201,7 +201,7 @@ $(function() {
 });
 
 // Make Sitemap filters show specific content types.
-$(function() {
+jQuery(function($){
   $('#sitemap li[data-nodetype]').hide();
   $('#filtershow').change(function() {
     $('#sitemap li[data-nodetype]').slideUp();

data/app/assets/javascripts/cms/user.js

@@ -26,7 +26,7 @@ Cms.User.current = function(handler) {
 };
 
 // Default Handler for login portlet. Hide the form, show 'Hello $first_name'
-$(function() {
+jQuery(function($){
   if ($('.login-portlet').exists()) {
     Cms.User.current({
         authenticated: function(user) {

data/app/assets/stylesheets/cms/_assets.css.scss

@@ -52,4 +52,9 @@
 			}
 		}
 	}
+}
+
+// Iframe for attachments
+#asset_add_uploader {
+  display: none;
 }

data/app/assets/stylesheets/cms/_main-area.css.scss

@@ -1,5 +1,5 @@
 /* MAIN FORM AREA */
-.main-content {
+.main-content, .modal-body {
 	@include rem(margin-top,1rem);
 
 	.add-link {

data/app/assets/stylesheets/cms/_sitemap.css.scss

@@ -5,8 +5,17 @@
 	border: 1px solid rgba(black,0.1);
 	@include border-radius(5px);
 	@include rem(margin-bottom,1.5rem);
+
+  .children {
+    width: 100%;
+    height: 0%;
+    &.hide {
+      display: none;
+    }
+  }
 }
 
+
 .nav-list {
 	width: 100%;
 	list-style-type: none;
@@ -23,6 +32,10 @@
       display: none;
     }
 	.nav-list-item {
+        display: block;
+        float: left;
+        clear: both;
+        width: 100%;
 		list-style-type: none;
 		margin: 0;
 		padding: 0;

data/app/assets/stylesheets/cms/styles/_images.css.scss

@@ -4,6 +4,17 @@ img {
 	height: auto;
 	display: inline-block;
 }
+
+// Image blocks viewed within the CMS shouldn't be 100% width.
+img[data-type="image_block"] {
+  width: auto;
+  max-width: 100%;
+}
+
+// For multiple attachments in the table
+img[data-purpose='attachment'] {
+  width:60px;
+}
 .img-rounded {
 	@include border-radius(6px);
 }

data/app/controllers/cms/application_controller.rb

@@ -1,6 +1,5 @@
 module Cms
   class ApplicationController < ::ApplicationController
     include Cms::AdminController
-
   end
 end

data/app/controllers/cms/content_controller.rb

@@ -67,6 +67,9 @@ module Cms
 
     def render_editing_frame
       @page_title = @page.page_title
+
+      # Adds all provided parameters to the iframe
+      @edit_page_path = ActionDispatch::Http::URL.url_for(path: edit_content_path(current_page), params: params.except(:controller, :action, :path), only_path: true)
       render 'editing_frame', :layout => 'cms/page_editor'
     end
 

data/app/controllers/cms/content_types_controller.rb

@@ -0,0 +1,14 @@
+require_dependency "cms/application_controller"
+
+module Cms
+  class ContentTypesController < ApplicationController
+
+    def index
+      content_type = ContentType.named(params[:content_type]).first
+      @attributes = content_type.orderable_attributes.sort()
+      respond_to do |format|
+        format.js { render :layout => false }
+      end
+    end
+  end
+end

data/app/controllers/cms/inline_content_controller.rb

@@ -14,16 +14,18 @@ module Cms
         status_label = "Published"
       end
 
-      # After a page update, all the connector ids change. So we need to send
+      # After a page update, all the connector ids can change. So we need to send
       # the new move up/down/remove paths to client so they will work after an inline update.
-      connectors = @page.current_connectors(params[:container].to_sym)
       routes = []
-      connectors.each do |c|
-        routes << {
-            move_up: cms.move_up_connector_path(c, format: :json),
-            move_down: cms.move_down_connector_path(c, format: :json),
-            remove: cms.connector_path(c, format: :json)
-        }
+      if params[:container]
+        connectors = @page.current_connectors(params[:container].to_sym)
+        connectors.each do |c|
+          routes << {
+              move_up: cms.move_up_connector_path(c, format: :json),
+              move_down: cms.move_down_connector_path(c, format: :json),
+              remove: cms.connector_path(c, format: :json)
+          }
+        end
       end
       results = {
           page_status: page_status,

data/app/controllers/cms/passwords_controller.rb

@@ -8,6 +8,11 @@ module Cms
       super
     end
 
+    def create
+      use_page_title('Forgot Password')
+      super
+    end
+
     def edit
       use_page_title('Change Password')
       super

data/app/controllers/cms/sites/passwords_controller.rb

@@ -16,6 +16,11 @@ module Cms
         super
       end
 
+      def edit
+        use_page_title('Reset Password')
+        super
+      end
+
       protected
 
       # @override [Devise::PasswordsController]

data/app/helpers/cms/content_types_helper.rb

@@ -0,0 +1,4 @@
+module Cms
+  module ContentTypesHelper
+  end
+end