tb_cms 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d674e42a14812fcc99fc125a85514ba33f016752e5cdcc7c4d7319e841505ea3
-  data.tar.gz: 5b1669484dff7f06e78db700051107954229d95ec11819a3d05144d5929fe050
+SHA1:
+  metadata.gz: 13270a188b116b592cf0ca1dfcc2693f89e10a72
+  data.tar.gz: ce7dfc3f907926f416f053b15276801570230840
 SHA512:
-  metadata.gz: b819655bcdbb65fc611da5ddbba4a159dcb9a495d05fbcbd46b7c8d04351d014b8d974b0889b2fb0b53162a089658b99cbe69a190b88916699fbfa97e9240a59
-  data.tar.gz: 6583b6a1d64056748b9252381e51d6cfda5949c7b119ed0a731e7b5e382cb9522e0e6355d1a9392ba36ed50509d2c3b9c233ed389f037a16a1d77e42f392e88a
+  metadata.gz: '09f2d4d365bd67a2e929d66c446cb34cffdcb60c9c07ced83c979261b2bc7be43507d8ba0e47f9f4965800cc74d852d13a1a1505667e9d103623f1fecaf30fd8'
+  data.tar.gz: b2c889ecec952493d8ea28fe54812f682cd8b0939455e718c6415d53fca081ab3dad0fec60c215edd7a09fcd919bd5a280a2decf004e30d09a738e15ae4ad0a7

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

@@ -2,4 +2,4 @@
 //= require admin/cms/pages
 //= require admin/cms/menu_items
 
-spud.admin.cms = {};
+tb.cms = {};

data/app/assets/javascripts/admin/cms/menu_items.js

@@ -1,7 +1,7 @@
-spud.admin.cms.menu_items = {};
+tb.cms.menu_items = {};
 
 (function() {
-  var menu_items = spud.admin.cms.menu_items;
+  var menu_items = tb.cms.menu_items;
   var val;
 
   var setUrl = function(){

data/app/assets/javascripts/admin/cms/pages.js

@@ -1,11 +1,10 @@
-spud.admin.cms.pages = {};
+tb.cms.pages = {};
 
 (function(){
 
-spud.admin.cms.pages = {
+tb.cms.pages = {
   edit: function(){
-    spud.admin.editor.init({selector: '.page-partial-content-editor', width: $("#page_partials_form").width()});
-    spud.admin.cms.pages.initFormTabs();
+    tb.cms.pages.initFormTabs();
     $(".btn-preview").on('click', clickedPreviewButton);
     $("#spud_page_layout").on('change', changedLayoutSelection);
   }
@@ -37,16 +36,16 @@ var changedLayoutSelection = function(e){
     spud.admin.editor.unload();
 
     $("#page_partials_form").replaceWith(data);
-    spud.admin.cms.pages.initFormTabs();
+    tb.cms.pages.initFormTabs();
 
-    spud.admin.editor.init({selector: '.page-partial-content-editor', width: $("#page_partials_form").width()});
+    tb.editor.init();
 
   }, 'text').error(function(jqXHR) {
     alert("Error: " + jqXHR.responseText);
   });
 };
 
-spud.admin.cms.pages.initFormTabs = function(){
+tb.cms.pages.initFormTabs = function(){
   var tabNames = [];
 
   $('.formtabs .formtab').each(function(tabind) {

data/app/controllers/admin/pages_controller.rb

@@ -4,7 +4,7 @@ class Admin::PagesController < Admin::ApplicationController
   before_action :load_page, only: [:edit, :update, :show, :destroy]
 
   def index
-    @pages = SpudPage.where(spud_page_id: nil).order(:page_order).includes(:spud_pages)
+    @pages = SpudPage.where(spud_page_id: nil).ordered.includes(:spud_pages)
     home_page = SpudPage.where(url_name: Spud::Cms.root_page_name).first
     if home_page.blank?
       flash.now[:warning] = "You have not setup your default CMS page. This page will be your homepage. To do so, create a page with the name '#{Spud::Cms.root_page_name.titlecase}'"

data/app/models/spud_page.rb

@@ -26,6 +26,7 @@ class SpudPage < ActiveRecord::Base
   scope :parent_pages, -> { where(spud_page_id: nil) }
   scope :published_pages, -> { where(published: true) }
   scope :viewable, -> { where(visibility: 0) }
+  scope :ordered, -> { order(page_order: :asc, name: :asc) }
 
   def full_content_processed
     ActiveSupport::Deprecation.warn('#full_content_processed is deprecated; use #full_content instead.')

data/app/views/admin/menu_items/index.html.erb

@@ -21,8 +21,8 @@
     <input type="hidden" value=<%= @menu.id %> id="menu-id">
   </div>
 <script type="text/javascript">
-  $(document).ready(spud.admin.cms.menu_items.init);
+  $(document).ready(tb.cms.menu_items.init);
 </script>
 
 <% end %>
-  
+

data/app/views/admin/pages/_form.html.erb

@@ -17,7 +17,7 @@
 	<%= f.fields_for :spud_page_partials do |b| %>
 		<div class="formtab tab-pane">
 			<%= b.hidden_field :name, :class => "tab_name" %>
-			<%= b.text_area :content, :class => "page-partial-content-editor" %>
+			<%= b.text_area :content, :class => "page-partial-content-editor tinymce" %>
 		</div>
 	<% end %>
 </div>
@@ -101,5 +101,5 @@
 <%= hidden_field_tag "preview", 0 %>
 
 <script type="text/javascript">
-  $(document).ready(spud.admin.cms.pages.edit);
+  $(document).ready(tb.cms.pages.edit);
 </script>

data/app/views/admin/pages/_page_partials_form.html.erb

@@ -8,7 +8,7 @@
 			<% if spud_page_partial.id %>
 				<%= hidden_field_tag "spud_page[spud_page_partials_attributes][#{index}][id]", spud_page_partial.id %>
 			<% end %>
-			<textarea class="page-partial-content-editor" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
+			<textarea class="page-partial-content-editor tinymce" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
 				<%= spud_page_partial.content %>
 			</textarea>
 		</div>

data/app/views/admin/pages/_page_row.html.erb

@@ -10,6 +10,6 @@
     <%= link_to 'Delete', admin_page_path(page), :method => :delete, :data => {:confirm => 'Are you sure?"'}, :class => 'btn btn-danger btn-sm' %>
   </td>
 </tr>
-<% page.spud_pages.each do |page| %>
+<% page.spud_pages.ordered.each do |page| %>
 	<%= render :partial => 'page_row', :locals => {:depth => depth+1, :page => page} %>
 <% end %>

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Cms
-    VERSION = '1.3.5'.freeze
+    VERSION = '1.3.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Moser Consulting
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -322,7 +322,7 @@ files:
 homepage: http://bitbucket.org/moser-inc/tb_cms
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -337,8 +337,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.12
+signing_key:
 specification_version: 4
 summary: Twice Baked CMS
 test_files: