caboose-cms 0.9.228 → 0.9.229

data/app/views/caboose/login_logs/admin_index_for_user.html.erb

@@ -11,7 +11,7 @@ $(document).ready(function() {
   var table = new IndexTable({    
     form_authenticity_token: '<%= form_authenticity_token %>',
     container: 'login_logs',
-    base_url: '/admin/login-logs',
+    base_url: '/admin/login-logs?user_id=<%= @edituser.id %>',
     allow_add: false,
     allow_bulk_import: false,
     allow_bulk_edit: false,

data/app/views/caboose/media/admin_index.html.erb

@@ -18,33 +18,23 @@
 <%= javascript_include_tag 'caboose/model/all' %>
 <%= javascript_include_tag 'caboose/admin_media_index.js' %>
 <%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
-
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/plupload/2.1.3/plupload.full.min.js"></script>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/plupload/2.1.3/jquery.ui.plupload/jquery.ui.plupload.min.js"></script>
 
-<script type="text/javascript" src="http://feather.aviary.com/imaging/v2/editor.js"></script>
 <script type="text/javascript">
-
-var controller = false;
-$(document).ready(function() {
-  controller = new MediaController({
-    top_cat_id: <%= raw Caboose.json(@media_category ? @top_media_category.id : false) %>,
-    cat_id: <%= raw Caboose.json(@media_category ? @media_category.id : false) %>,
-    s3_upload_url: '<%= raw @s3_upload_url %>',		      		  	
-	  aws_access_key_id: '<%= raw @aws_access_key_id %>',		
-	  policy: '<%= raw @policy %>',
-	  signature: '<%= raw @signature %>',
-	  refresh_unprocessed_images: true,
-    allow_edit: true,
-    assets_path: "<%= Rails.env.production? ? ('https://' + Caboose::cdn_domain + '/assets/') : '/assets/' %>"
+  var controller = false;
+  $(document).ready(function() {
+    controller = new MediaController({
+      top_cat_id: <%= raw Caboose.json(@media_category ? @top_media_category.id : false) %>,
+      cat_id: <%= raw Caboose.json(@media_category ? @media_category.id : false) %>,
+      s3_upload_url: '<%= raw @s3_upload_url %>',		      		  	
+  	  aws_access_key_id: '<%= raw @aws_access_key_id %>',		
+  	  policy: '<%= raw @policy %>',
+  	  signature: '<%= raw @signature %>',
+  	  refresh_unprocessed_images: true,
+      allow_edit: false,
+      assets_path: "<%= Rails.env.production? ? ('https://' + Caboose::cdn_domain + '/assets/') : '/assets/' %>"
+    });
   });
-});
-
 </script>
-<% end %>
-
-<%
-# Adobe Image Editor SDK Credentials
-# CLIENT SECRETf42be039-1af0-41d8-89bb-fdebdb557d3d
-# CLIENT ID (DEVELOPMENT MODE)*933414ee42934e8b81d8cd2226a5a13b
-%>
+<% end %>

data/app/views/caboose/my_account/index.html.erb

@@ -250,5 +250,6 @@ function reset_user_password(pass1, pass2)
 </script>
 <% end %>
 <%= content_for :caboose_css do %>
+<%= stylesheet_link_tag "caboose/model_binder", :media => "all" %>
 <%= stylesheet_link_tag "caboose/my_account", :media => "all" %>
 <% end %>

data/app/views/caboose/pages/_admin_header.html.erb

@@ -49,6 +49,11 @@ tabs = {
   'Delete Page'     => "/admin/pages/#{@page.id}/delete" 
 }
 
+if @site.use_change_logs && Caboose::ChangeLog.where(:page_id => @page.id).exists? && @logged_in_user.is_allowed('logs','view')
+  arr = tabs.to_a.insert(8, ['Change Logs', "/admin/pages/#{@page.id}/logs"])
+  tabs = Hash[arr]
+end
+
 %>
 <% tabs.each do |text, href| %>
 <li<%= raw request.fullpath == href ? " class='selected'" : '' %>><a href='<%= href %>'><%= raw text %></a></li>

data/app/views/caboose/pages/admin_change_logs.html.erb

@@ -0,0 +1,56 @@
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<div style="padding-right:30px;">
+	<table cellpadding="0" cellspacing="0">
+<thead>
+	<tr>
+		<th>User</th>
+		<th>Date</th>
+		<th>Action</th>
+		<th>Field</th>
+		<th>Old Value</th>
+		<th>New Value</th>
+	</tr>
+</thead>
+<% @logs.each do |log| %>
+	<tr>
+		<td><%= log.user.username %></td>
+		<td><%= log.timestamp.in_time_zone('Central Time (US & Canada)').strftime('%-m/%-d/%y, %l:%M%P') %></td>
+		<td><%= log.describe_action %></td>
+		<td><%= log.description %></td>
+		<td><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_old.blank? && log.describe_old.include?('</')) ? "<pre>" : "" %><%= log.describe_old %><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_old.blank? && log.describe_old.include?('</')) ? "</pre>" : "" %></td>
+		<td><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_new.blank? && log.describe_new.include?('</')) ? "<pre>" : "" %><%= log.describe_new %><%== (!log.description.blank? && log.description.include?('Custom Css') || log.description.include?('Custom Js')) || (!log.describe_new.blank? && log.describe_new.include?('</')) ? "</pre>" : "" %></td>
+	</tr>
+<% end %>
+</table>
+</div>
+
+
+<% content_for :caboose_css do %>
+	<style>
+		table {
+			width: 100%;
+		}
+		table tr {
+
+		}
+		table td, table th {
+			font-family: "Roboto";
+			font-weight: 300;
+			font-size: 13px;
+			padding: 6px 8px 6px 4px;
+			text-align: left;
+			max-width: 200px;
+			border-bottom: 1px solid #eaeaea;
+		}
+		td pre {
+			overflow: hidden;
+    	white-space: pre-line;
+    	font-size: 12px;
+    	font-family: monospace;
+		}
+		table th {
+			font-weight: bold;
+		}
+	</style>
+<% end %>

data/app/views/caboose/pages/admin_edit_content.html.erb

@@ -1,6 +1,8 @@
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'jquery-ui' %>
 <%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
+<%= stylesheet_link_tag "colorbox-rails" %>
+<%= stylesheet_link_tag 'caboose/model_binder' %>
 <% if @site && @site.use_dragdrop %>
 <%= stylesheet_link_tag 'caboose/admin_edit_page_content_dragdrop' %>
 <% else %>
@@ -11,9 +13,11 @@
 <% end %>
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'jquery-ui' %>
+<%= javascript_include_tag 'colorbox-rails' %>
+<%= javascript_include_tag 'caboose/modal_integration' %>
 <%= javascript_include_tag 'caboose/model/all' %>
 <%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
-<%= javascript_include_tag "caboose/clipboard" %>
+<%# javascript_include_tag "caboose/clipboard" %>
 <%= javascript_include_tag "caboose/class" %>
 <%= javascript_include_tag "caboose/modal_controller" %>
 <% if @site && @site.use_dragdrop %>
@@ -46,7 +50,7 @@ $(document).ready(function() {
     .append($('<a/>').attr('href', '/admin/pages').html("< Back"))
     .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/revert').html("Revert"))
     .append($('<a/>').attr('href', '/pages/preview/<%= @page.id %>').attr('target','_blank').html("Preview"))
-    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/publish').html("Publish"))
+    .append($('<a/>').attr('href', '#').attr('onclick','controller.publish_page();return false;').html("Publish").addClass('pub'))
   <% if @page.page_custom_field_values.count > 0 %>
     .append($('<a/>').attr('href', '#').html('Custom Fields').click(function(e) { e.preventDefault(); caboose_modal_url('/admin/pages/<%= @page.id %>/custom-fields'); }))
   <% end %>

data/app/views/caboose/pages/admin_edit_general.html.erb

@@ -22,18 +22,25 @@
 </div>
 <% end %>
 
+<% if @site.use_caching %>
+<div class='field_with_explanation'>
+  <a href="#" onclick="refresh_cache(<%= @page.id %>, false);return false;" id="refresh">Refresh cache for this page</a>
+  <div id="cmessage"></div>
+</div>
+<% end %>
+
 <%= render :partial => 'caboose/pages/admin_footer' %>
 
 <% content_for :caboose_css do %>
   <style>
-    a#promote {
+    a#promote, a#refresh {
       color: #565daa;
       font-size: 13px;
       text-decoration: none;
       display: inline-block;
       margin-bottom: 7px;
     }
-    a#promote:hover {
+    a#promote:hover, a#refresh:hover {
       text-decoration: underline;
     }
   </style>
@@ -86,13 +93,13 @@ function promote_page(page_id, confirm)
   if (!confirm)
   {
     var p = $('<p/>').addClass('note warning')
-      .append("Are you sure you want to do this? This page will replace the existing homepage. The existing homepage will be hidden but not deleted.")
+      .append("Are you sure you want to do this? This page will replace the existing homepage. The existing homepage will be hidden but not deleted. ")
       .append($('<input/>').attr('type','button').val('Yes').click(function() { promote_page(page_id, true); })).append(' ')
       .append($('<input/>').attr('type','button').val('No').click(function() { $('#pmessage').empty(); }));      
     $('#pmessage').empty().append(p);
     return;
   }  
-  $('#pmessage').empty().html($('<p/>').addClass('loading').html("Promoting page..."));
+  $('#pmessage').empty().html($('<p/>').addClass('note loading').html("Promoting page..."));
   $.ajax({
     url: '/admin/pages/' + page_id + '/promote',
     type: 'put',    
@@ -103,5 +110,26 @@ function promote_page(page_id, confirm)
   });
 }
 
+function refresh_cache(page_id, confirm) 
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note warning')
+      .append("Are you sure? ")
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { refresh_cache(page_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#cmessage').empty(); }));      
+    $('#cmessage').empty().append(p);
+    return;
+  }  
+  $('#cmessage').empty().html($('<p/>').addClass('note loading').html("Finding blocks to cache..."));
+  $.ajax({
+    url: '/api/pages/' + page_id + '/refresh-cache',
+    type: 'get',    
+    success: function(resp) {
+      if (resp.success) $('#cmessage').html("<p class='note success'>Page cache will be refreshed.</p>");
+    }
+  });
+}
+
 </script>
 <% end %>

data/app/views/caboose/posts/_admin_header.html.erb

@@ -15,6 +15,11 @@ tabs = {
   "/admin/posts/#{@post.id}/delete"     => 'Delete Post'
 }
 
+if @site.use_change_logs && Caboose::ChangeLog.where(:post_id => @post.id).exists? && @logged_in_user.is_allowed('logs','view')
+  arr = tabs.to_a.insert(4, ["/admin/posts/#{@post.id}/logs", "Change Logs"])
+  tabs = Hash[arr]
+end
+
 %>
 <% tabs.each do |href,text| %>
 <li<%= raw request.fullpath == href ? " class='selected'" : '' %>><a href='<%= href %>'><%= raw text %></a></li>

data/app/views/caboose/posts/admin_change_logs.html.erb

@@ -0,0 +1,56 @@
+<%= render :partial => 'caboose/posts/admin_header' %>
+
+<div style="padding-right:30px;">
+	<table cellpadding="0" cellspacing="0">
+<thead>
+	<tr>
+		<th>User</th>
+		<th>Date</th>
+		<th>Action</th>
+		<th>Field</th>
+		<th>Old Value</th>
+		<th>New Value</th>
+	</tr>
+</thead>
+<% @logs.each do |log| %>
+	<tr>
+		<td><%= log.user.username %></td>
+		<td><%= log.timestamp.in_time_zone('Central Time (US & Canada)').strftime('%-m/%-d/%y, %l:%M%P') %></td>
+		<td><%= log.describe_action %></td>
+		<td><%= log.description %></td>
+		<td><%== !log.describe_old.blank? && log.describe_old.include?('</') ? "<pre>" : "" %><%= log.describe_old %><%== !log.describe_old.blank? && log.describe_old.include?('</') ? "</pre>" : "" %></td>
+		<td><%== !log.describe_new.blank? && log.describe_new.include?('</') ? "<pre>" : "" %><%= log.describe_new %><%== !log.describe_new.blank? && log.describe_new.include?('</') ? "</pre>" : "" %></td>
+	</tr>
+<% end %>
+</table>
+</div>
+
+
+<% content_for :caboose_css do %>
+	<style>
+		table {
+			width: 100%;
+		}
+		table tr {
+
+		}
+		table td, table th {
+			font-family: "Roboto";
+			font-weight: 300;
+			font-size: 13px;
+			padding: 6px 8px 6px 4px;
+			text-align: left;
+			max-width: 200px;
+			border-bottom: 1px solid #eaeaea;
+		}
+		td pre {
+			overflow: hidden;
+    	white-space: pre-line;
+    	font-size: 12px;
+    	font-family: monospace;
+		}
+		table th {
+			font-weight: bold;
+		}
+	</style>
+<% end %>

data/app/views/caboose/posts/admin_delete_form.html.erb

@@ -15,7 +15,7 @@
 
 function delete_post(post_id, confirm)
 {
-  $('#message').html("<p class='loading'>Deleting post...</p>");
+  $('#message').html("<p class='note loading'>Deleting post...</p>");
   $.ajax({
     url: '/admin/posts/' + post_id,
     type: 'delete',

data/app/views/caboose/posts/admin_edit_content.html.erb

@@ -1,6 +1,8 @@
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'jquery-ui' %>
 <%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
+<%= stylesheet_link_tag "colorbox-rails" %>
+<%= stylesheet_link_tag 'caboose/model_binder' %>
 <% if @site && @site.use_dragdrop %>
 <%= stylesheet_link_tag 'caboose/admin_edit_page_content_dragdrop' %>
 <% else %>
@@ -11,9 +13,11 @@
 <% end %>
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'jquery-ui' %>
+<%= javascript_include_tag 'colorbox-rails' %>
+<%= javascript_include_tag 'caboose/modal_integration' %>
 <%= javascript_include_tag 'caboose/model/all' %>
 <%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
-<%= javascript_include_tag "caboose/clipboard" %>
+<%# javascript_include_tag "caboose/clipboard" %>
 <%= javascript_include_tag "caboose/class" %>
 <%= javascript_include_tag "caboose/modal_controller" %>
 <% if @site && @site.use_dragdrop %>
@@ -46,7 +50,7 @@ $(document).ready(function() {
     .append($('<a/>').attr('href', '/admin/posts').html("< Back"))
     .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>/revert').html("Revert"))
     .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>/preview-post').attr('target','_blank').html("Preview"))
-    .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>/publish').html("Publish"))
+    .append($('<a/>').attr('href', '#').attr('onclick','controller.publish_page();return false;').html("Publish").addClass('pub'))
     .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>').html("Post Settings"))
     .append($('<a/>').attr('href', '<%= @post.uri %>').attr('target','_blank').text("View Post"))  
   );

data/app/views/caboose/products/admin_group_variants.html.erb

@@ -199,7 +199,7 @@
 <%= render partial: 'caboose/products/admin_footer' %>
 
 <% content_for :caboose_js do %>
-	<%= javascript_include_tag 'underscore' %>
+	<%= javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.9.1/underscore-min.js' %>
 	
 	<script>
 		window.count = <%= @variants.count %>;

data/app/views/caboose/products/admin_sort.html copy.erb

@@ -33,7 +33,7 @@
 </section>
 
 <% content_for :caboose_js do %>
-  <%= javascript_include_tag('underscore') %>
+  <%= javascript_include_tag('https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.9.1/underscore-min.js') %>
   <%= javascript_include_tag('caboose/jquery-ui') %>
   <%= javascript_include_tag('caboose/jquery-ui-multisortable') %>
   

data/app/views/caboose/sites/admin_edit.html.erb

@@ -13,14 +13,21 @@ user_ids = [] if user_ids.nil?
 </p>
 <p><div id='site_<%= @site.id %>_description'             ></div></p>
 <p><div id='site_<%= @site.id %>_under_construction_html' ></div></p>
+<p><div id='site_<%= @site.id %>_use_change_logs'         ></div></p>
 <p><div id='site_<%= @site.id %>_use_store'               ></div></p>
 <p><div id='site_<%= @site.id %>_use_fonts'               ></div></p>
 <p><div id='site_<%= @site.id %>_use_dragdrop'            ></div></p>
+<p><div id='site_<%= @site.id %>_use_caching'             ></div></p>
+<% if @site.use_caching %>
+  <div class="cache"><a style="font-size:13px;color:#7373c3;text-decoration:none;" href="#" onclick="refresh_cache(<%= @site.id %>);return false;">Refresh all page caches</a></div>
+  <div id="c-message"></div>
+<% end %>
 <p><div id='site_<%= @site.id %>_allow_self_registration' ></div></p>
 <% if @site.theme.nil? %>
 <p><div id='site_<%= @site.id %>_theme_color' ></div></p>
 <% end %>
 <p><div id='site_<%= @site.id %>_assets_url' ></div></p>
+<p><div id='site_<%= @site.id %>_google_api_key' ></div></p>
 <p><div id='site_<%= @site.id %>_default_layout_id'       ></div></p>
 <p><div id='site_<%= @site.id %>_favicon'                    ></div></p>
 <p><div id='site_<%= @site.id %>_recaptcha_threshold'       ></div></p>
@@ -102,10 +109,13 @@ $(document).ready(function() {
       { name: 'description'             , nice_name: 'Description'              , type: 'text' , value: <%= raw Caboose.json(@site.description)                            %>, width: 600  },
       { name: 'theme_color'             , nice_name: 'Theme Color'              , type: 'text' , value: <%= raw Caboose.json(@site.theme_color)                            %>, width: 600  },
       { name: 'assets_url'             , nice_name: 'Assets URL'              , type: 'text' , value: <%= raw Caboose.json(@site.assets_url)                            %>, width: 600  },
+      { name: 'google_api_key'             , nice_name: 'Google Maps API Key'              , type: 'text' , value: <%= raw Caboose.json(@site.google_api_key)                            %>, width: 600  },
       { name: 'under_construction_html' , nice_name: 'Under Construction HTML'  , type: 'textarea' , value: <%= raw Caboose.json(@site.under_construction_html)                %>, width: 600, height: 220 },
       { name: 'use_store'               , nice_name: 'Enable Store'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_store               ? true : false) %>, width: 400 },
+      { name: 'use_change_logs'               , nice_name: 'Enable Logs'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_change_logs               ? true : false) %>, width: 400 },
       { name: 'use_fonts'               , nice_name: 'Enable Fonts'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_fonts               ? true : false) %>, width: 400 },
       { name: 'use_dragdrop'               , nice_name: 'Enable Drag & Drop'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_dragdrop              ? true : false) %>, width: 400 },
+      { name: 'use_caching'               , nice_name: 'Enable Caching'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_caching              ? true : false) %>, width: 400 },
       { name: 'allow_self_registration' , nice_name: 'Allow Self Registration'  , type: 'checkbox' , value: <%= raw Caboose.json(@site.allow_self_registration ? true : false) %>, width: 400 },
       { name: 'default_layout_id'       , nice_name: 'Default Layout'           , type: 'select'   , value: <%= raw Caboose.json(@site.default_layout_id)                      %>, width: 600, options_url: "/admin/sites/<%= @site.id %>/default-layout-options" },
       { name: 'recaptcha_threshold'               , nice_name: 'Recaptcha Threshold'             , type: 'text' , value: <%= raw Caboose.json(@site.recaptcha_threshold)  %>, width: 250 }    
@@ -113,6 +123,17 @@ $(document).ready(function() {
   });       
 });
 
+function refresh_cache(site_id) {
+  $(".cache").hide();
+  $.ajax({
+    url: '/admin/sites/' + site_id + '/refresh-cache',
+    type: 'put',
+    success: function(resp) {
+      $("#c-message").html("<p class='note success'>Page caches are being refreshed now.</p>");
+    }
+  });
+}
+
 function set_under_construction(site_id, domain_id, checked)
 {
   $.ajax({

data/app/views/caboose/themes/admin_edit.html.erb

@@ -10,10 +10,14 @@ position = header.child('position') if header
 <div class="admin-theme grid-row">
   <div class="unit1of2 left">
     <section>
-      <h5>Compile</h5>
+      <h5>
+        Compile
+        <a href="/admin/theme/errors" style="display:inline-block;font-size:12px;margin-left:15px;text-decoration:none;color:gray;" id="error">Error Log</a>
+      </h5>
       <div class="buttons">
-        <a style="margin-right:5px;" href="#" id="compile-btn" class="caboose-btn">Compile Theme</a>
-        <a href="/admin/theme/sass" class="caboose-btn">Edit Custom SCSS</a>
+        <a style="margin-right:3px;" href="#" id="compile-btn" class="caboose-btn">Compile Theme</a>
+        <a style="margin-right:3px;" href="/admin/theme/sass" class="caboose-btn">Edit SCSS</a>
+        <a href="/admin/theme/js" class="caboose-btn">Edit Javascript</a>
       </div>
       
       <div style="margin-top:20px;" id='message'></div>