tb_cms 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6efebf0dfac267a54330cb74831bc7a283d46e8
-  data.tar.gz: b3ec8956a99c0c9804af05225f96bf58fdb241a4
+  metadata.gz: 29ed12dca3e942e4ee2e13842af13957f9ddbd78
+  data.tar.gz: 4437788f0073809f050876e5595e192aabf87e96
 SHA512:
-  metadata.gz: 29c6bf42bdb2c0d4bb05fecfc9c5c4d5572c5a8c257ec980b1389e32472a6f00c54bf9a28a292cdbb1eaa51c834acd2685e3dc5e46465961b1a6faaa4ee986bd
-  data.tar.gz: c901815412d8c43e83ad3a37205808d3367a3ff2f8c37c075b93b9d80893fa672179b5b035446fb0ca46f25367df485a2be784416e83567223cf6fd761c31058
+  metadata.gz: d64be12a48126572e2b31dec5aa5ed13305e11c415d9ea30a1286337a42c76f8d221731dd9b95f5446cde01b18b8b56d60a96c2b84e151b918cc404061187de6
+  data.tar.gz: cc7cf7203a6963802c198ee3869fc3b531a9b2032dedaa933ba32860a72d01e4879cbfab42e0e43e19892ba524e48f225d117e7aca08cf9e5f8900ee802f4935

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

@@ -1,29 +1,49 @@
 spud.admin.cms.pages = {};
 
 (function(){
-  var pages = spud.admin.cms.pages;
-
-
-  pages.initFormTabs = function(){
-    var tabNames = [];
-
-    $('.formtabs .formtab').each(function(tabind) {
-      if(tabind === 0) {
-        $(this).addClass('active');
-      }
-      this.id = 'tab-' + tabind;
-      tabNames.push($('.tab_name',this).first().val());
-    });
-
-    var tabButtons = $('.formtabs .formtab_buttons').first();
-    for(var x=0;x<tabNames.length;x++)
-    {
-      var tabButton = $('<li><a href="#tab-' + x + '" data-toggle="tab">' + tabNames[x] + '</a></li>');
-      if(x === 0) {
-        tabButton.addClass('active');
-      }
-      tabButtons.append(tabButton);
+
+spud.admin.cms.pages = {
+  edit: function(){
+    $(".btn-preview").on('click', clickedPreviewButton);
+  }
+};
+
+var clickedPreviewButton = function(e){
+  var button = $(this);
+  var previewInput = $('input#preview');
+  var form = button.parents('form')[0];
+
+  button.button('reset');
+  form.target = '_blank';
+  previewInput.val(1);
+
+  setTimeout(function(){
+    form.target = '';
+    form.onSubmit = null;
+    previewInput.val(0);
+  }, 200);
+};
+
+spud.admin.cms.pages.initFormTabs = function(){
+  var tabNames = [];
+
+  $('.formtabs .formtab').each(function(tabind) {
+    if(tabind === 0) {
+      $(this).addClass('active');
+    }
+    this.id = 'tab-' + tabind;
+    tabNames.push($('.tab_name',this).first().val());
+  });
+
+  var tabButtons = $('.formtabs .formtab_buttons').first();
+  for(var x=0;x<tabNames.length;x++)
+  {
+    var tabButton = $('<li><a href="#tab-' + x + '" data-toggle="tab">' + tabNames[x] + '</a></li>');
+    if(x === 0) {
+      tabButton.addClass('active');
     }
+    tabButtons.append(tabButton);
+  }
+};
 
-  };
 })();

data/app/controllers/admin/pages_controller.rb

@@ -68,7 +68,7 @@ class Admin::PagesController < Admin::ApplicationController
 	end
 
 	def update
-		@page.attributes = page_params
+		@page.assign_attributes(page_params)
 		if params[:preview] && params[:preview].to_i == 1
 			preview
 			return
@@ -108,11 +108,19 @@ class Admin::PagesController < Admin::ApplicationController
     template =  params[:template] && !params[:template].blank? ? layouts[params[:template]] : nil
     page = SpudPage.where(:id => params[:page]).includes(:spud_page_partials).first
     page = SpudPage.new if page.blank?
+    
     old_page_partials = Array.new(page.spud_page_partials)
     new_page_partials = []
+    
     if !template.blank?
       template[:partials].each do |page_part|
-        new_page_partials << page.spud_page_partials.build(:name => page_part.strip)
+        old_partial = old_page_partials.find{|pp| page_part.strip == pp.name }
+        if old_partial
+          new_page_partials << old_partial
+          old_page_partials.delete(old_partial)
+        else
+          new_page_partials << page.spud_page_partials.build(:name => page_part.strip)
+        end
       end
     else
       layout, layout_info = layouts.select{|k,v| v[:default]}.flatten
@@ -121,17 +129,14 @@ class Admin::PagesController < Admin::ApplicationController
   			new_page_partials << page.spud_page_partials.build(:name => part)
   		end
     end
-    new_page_partials.each do |partial|
-      old_partial = old_page_partials.select {|pp| partial.name.strip.downcase == pp.name.strip.downcase }
-      logger.debug "testing content swap"
-      partial.content = old_partial[0].content if !old_partial.blank?
-      logger.debug partial.content
-    end
 
     respond_to do |format|
       format.js {
         if response.status == 200
-          render(:partial => 'page_partials_form', :locals => {:spud_page_partials => new_page_partials, :remove_page_partials => old_page_partials})
+          render(:partial => 'page_partials_form', :locals => {
+            :spud_page_partials => new_page_partials,
+            :remove_page_partials => old_page_partials
+          })
         else
           render(:text => message)
         end
@@ -145,8 +150,6 @@ class Admin::PagesController < Admin::ApplicationController
     redirect_to admin_pages_url
   end
 
-
-
 private
 	def load_page
 		@page = SpudPage.where(:id => params[:id]).includes(:spud_page_partials).first
@@ -161,7 +164,9 @@ private
 	end
 
   def page_params
-    params.require(:spud_page).permit(:name, :url_name, :created_by, :updated_by, :layout, :visibility, :spud_page_id, :publish_at, :format, :meta_description, :meta_keywords, :page_order, :spud_page_partials_attributes, :use_custom_url_name, :published, :notes, :spud_page_partials_attributes => [:id,:name, :content, :format])
+    params.require(:spud_page).permit(:name, :url_name, :created_by, :updated_by, :layout, :visibility, :spud_page_id,
+      :publish_at, :format, :meta_description, :meta_keywords, :page_order, :spud_page_partials_attributes, :use_custom_url_name,
+      :published, :notes, :spud_page_partials_attributes => [:id, :name, :content, :format, :_destroy])
   end
 
 end

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

@@ -11,12 +11,12 @@
 <div id="page_partials_form" class="formtabs tab-content">
 	<ul class="formtab_buttons nav nav-tabs">
 	</ul>
-	<%=f.fields_for :spud_page_partials do |b|%>
+	<%= 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 => "tinymce"%>
+			<%= b.hidden_field :name,:class => "tab_name" %>
+			<%= b.text_area :content,:class => "tinymce" %>
 		</div>
-	<%end%>
+	<% end %>
 </div>
 <br />
 <fieldset>
@@ -90,6 +90,9 @@
         <span class="help-inline">Have a note to make about this page while you work? Place it here for later.</span>
       </div>
     </div>
-  <%=hidden_field_tag "preview",:value => 0%>
+  <%= hidden_field_tag "preview", 0 %>
 </fieldset>
 
+<script type="text/javascript">
+  $(document).ready(spud.admin.cms.pages.edit);
+</script>

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

@@ -5,7 +5,10 @@
 	<% spud_page_partials.each_with_index do |spud_page_partial, index| %>
 		<div class="formtab tab-pane">
 			<input type="hidden" class="tab_name" name="spud_page[spud_page_partials_attributes][<%= index %>][name]" value="<%= spud_page_partial.name %>" />
-			<textarea class="wysiwym tinymce" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
+			<% if spud_page_partial.id %>
+				<%= hidden_field_tag "spud_page[spud_page_partials_attributes][#{index}][id]", spud_page_partial.id %>
+			<% end %>
+			<textarea class="tinymce" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
 				<%= spud_page_partial.content %>
 			</textarea>
 		</div>

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

@@ -1,32 +1,7 @@
-<%=form_for @page,:url => admin_page_path(:id => @page.id),:html=>{:class=>"form-horizontal page_form",:target => "report" } do |f|%>
+<%=form_for @page,:url => admin_page_path(:id => @page.id),:html=>{:class=>"form-horizontal page_form"} do |f|%>
 	<%=render :partial => "form",:locals => {:f => f}%>
     <div class="form-actions">
     	<%=f.submit "Save Page", :class=>"btn btn-primary btn-save" %>&nbsp;<%=f.submit "Preview", :class=>"btn btn-info btn-preview"%> or <%=link_to "cancel",admin_pages_path,:class => "btn"%>
     </div>
 <%end%>
 <br />
-<script type="text/javascript">
-$(document).ready(function() {
-	$('input[type=submit].btn-preview').click(function(evt) {
-		
-		$(this).button('reset')
-		$('#preview').val(1);
-		var form = $('form.page_form')[0];
-		form.onsubmit = function() {
-			window.open('about:blank','preview_window','width=500,height=400')
-		};
-		form.target = 'preview_window';
-		
-	});
-
-	$('input[type=submit].btn-save').click(function(evt) {
-		$('#preview').val(0);
-			var form = $('form.page_form')[0];
-			form.onsubmit = null;
-			form.target = null;
-	});
-	
-});
-
-</script>
-

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

@@ -5,30 +5,3 @@
     </div>
 
 <%end%>
-
-
-  
-<script type="text/javascript">
-$(document).ready(function() {
-	$('input[type=submit].btn-preview').click(function(evt) {
-		
-		$(this).button('reset')
-		$('#preview').val(1);
-		var form = $('form.page_form')[0];
-		form.onsubmit = function() {
-			window.open('about:blank','preview_window','width=500,height=400')
-		};
-		form.target = 'preview_window';
-		
-	});
-
-	$('input[type=submit].btn-save').click(function(evt) {
-		$('#preview').val(0);
-			var form = $('form.page_form')[0];
-			form.onsubmit = null;
-			form.target = null;
-	});
-	
-});
-
-</script>

data/lib/spud_cms/engine.rb

@@ -1,6 +1,5 @@
 require 'tb_core'
 require 'tb_permalinks'
-require 'codemirror-rails'
 require 'tb_liquid'
 
 module Spud

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "1.1.0"
+		VERSION = "1.1.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails