caboose-cms 0.9.228 → 0.9.229

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

@@ -0,0 +1,9 @@
+<h1>Error Log</h1>
+
+<a href="#" onclick="window.history.back();return false;" class="caboose-btn">Back</a>
+
+<% if !@theme.sass_error.blank? %>
+<div class="error" style="font-size:13px;line-height:18px;font-family:monospace;margin-top:10px;">
+	<%== @theme.sass_error.gsub("\n","<br />") %>
+</div>
+<% end %>

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

@@ -0,0 +1,131 @@
+
+<h1 id='page_title'>Edit Site Javascript</h1>
+
+ 
+<div class="editor-wrapper">
+
+  <div class="holder">
+    <div class="clearfix buttons">
+      <p class="warning">WARNING: This code will apply to the entire website. Edit with caution.</p>
+      <a href="/admin/theme" class="caboose-btn">Back</a>
+      <a href="#" onclick="save();return false;" class="caboose-btn green">Save</a>
+      <span id="modified">Modified</span>
+      <div id="message"></div>
+      <p id="tips">
+        <span>Command+S = Save</span>
+      </p>
+    </div>
+    <div id="editor"><%= @theme.main_js %></div>
+  </div>
+  
+</div>
+
+<% content_for :caboose_css do %>
+<style>
+p.warning {
+  color: #d43030;
+  font-size: 14px;
+  font-weight: bold;
+  margin: 0 0 8px 0;
+}
+p#tips {
+  display: inline-block;
+  float: right;
+  font-size: 13px;
+  color: gray;
+  margin: 0;
+  padding-top: 15px;
+  padding-right: 2px;
+}
+p#tips span {
+  display: inline-block;
+  margin-left: 12px;
+}
+span#modified {
+  font-size: 13px;
+  color: gray;
+  margin: 0 10px;
+  opacity: 0;
+  transition: opacity 100ms ease;
+}
+.buttons {
+  margin-bottom: 10px;
+}
+.buttons .caboose-btn {
+  margin-right: 5px;
+}
+  .editor-wrapper {
+
+  padding-right: 30px;
+  }
+
+  .holder {
+
+  }
+  #editor {
+  height: 800px;
+  width: 100%;
+  opacity: 0;
+  }
+  #editor.ace_editor {
+    opacity: 1;
+  }
+  #message {
+    display: inline-block;
+  }
+  #message p.note {
+    padding: 1px 15px 2px 15px;
+    font-size: 15px;
+    line-height: 30px;
+    border-radius: 5px;
+  }
+  #message p.note.loading {
+    padding-left: 40px;
+  }
+</style>
+<% end %>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.1/ace.js' %>
+<script>
+  var editor = ace.edit("editor");
+  editor.setTheme("ace/theme/monokai");
+  editor.session.setMode("ace/mode/javascript");
+  editor.session.setOptions({
+      tabSize: 2
+  });
+
+  editor.on("change", function() {
+    $("span#modified").css('opacity',1);
+  });
+
+  editor.commands.addCommand({
+    name: 'save',
+    bindKey: {win: "Ctrl-S", "mac": "Cmd-S"},
+    exec: function(editor) { save(); }
+  });
+
+  function save() {
+    $('#message').html("<p class='note loading'>Saving code...</p>").fadeIn();
+    $.ajax({
+      url: '/admin/theme/js',
+      type: 'put',
+      data: {
+        code: editor.getValue()
+      },
+      success: function(resp) {
+        if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>").fadeIn();
+        if (resp.success) {
+          $("span#modified").css('opacity',0);
+          $('#message').html("<p class='note success'>JS saved!</p>").fadeIn().delay(2000).fadeOut();
+        }
+      }
+    });
+  }
+
+</script>
+<% end %>
+
+<br style='clear: left; line-height: 0;' />
+
+

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

@@ -26,6 +26,10 @@ if Caboose::Subscription.where(:site_id => @site.id).exists?
 	arr = tabs.to_a.insert(6, ['Subscriptions', "/admin/users/#{@edituser.id}/subscriptions"])
   tabs = Hash[arr]
 end
+if @site.use_change_logs && Caboose::ChangeLog.where(:user_id => @edituser.id).exists? && @logged_in_user.is_allowed('logs','view')
+  arr = tabs.to_a.insert(4, ["Change Logs","/admin/users/#{@edituser.id}/logs"])
+  tabs = Hash[arr]
+end
 tabs = Caboose.plugin_hook('admin_user_tabs', tabs, @edituser, @site)
 %>
 <% tabs.each do |text, href| %>

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

@@ -0,0 +1,63 @@
+<%= render :partial => 'caboose/users/admin_header' %>
+
+<div style="padding-right:30px;">
+	<table cellpadding="0" cellspacing="0">
+<thead>
+	<tr>
+		<th>Resource</th>
+		<th>Title</th>
+		<th>Date</th>
+		<th>Action</th>
+		<th>Field</th>
+		<th>Old Value</th>
+		<th>New Value</th>
+	</tr>
+</thead>
+<% @logs.each do |log| %>
+	<%
+		res = log.page_id ? Caboose::Page.where(:id => log.page_id).first : (log.post_id ? Caboose::Post.where(:id => log.post_id).first : (log.media_id ? Caboose::Media.where(:id => log.media_id).first : nil))
+		res_type = log.page_id ? "Page" : (log.post_id ? "Post" : (log.description.include?('Media Category') && log.media_id ? ('Media Category') : (log.media_id ? "Media" : nil)))
+		res_title = res ? (log.page_id ? res.title : (log.post_id ? res.title : (log.description.include?('Media Category') && log.media_id ? (log.description.gsub('Media Category: ','')) : (log.media_id ? Caboose::Media.title_for_id(res.id) : "N/A")))) : log.description.gsub("Media Category: ","")
+	%>
+	<tr>
+		<td><%= res_type %></td>
+		<td><%= res_title %></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.blank? ? '' : log.description.gsub("Media Category: ",'') %></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/users/admin_edit_roles.html.erb

@@ -6,6 +6,7 @@
 <div id='roles'>
 <table class='data'>
 <% Caboose::Role.flat_tree(@site.id).each do |r| %>
+<% next if !@logged_in_user.is_allowed('all','all') && (r.name == 'Admin' || r.name == 'Everyone Logged Out' || r.name == '-Everyone Logged In') %>
 <% is_member = Caboose::RoleMembership.where(:role_id => r.id, :user_id => @edituser.id).exists? %>
 <tr><td><input type='checkbox' name='role<%= r.id %>' <%= is_member ? "checked='true'" : '' %> onclick="toggle_role(<%= @edituser.id %>, <%= r.id %>, $(this).prop('checked'));" /></td><td><%= r.name %></td></tr>
 <% end %>

data/app/views/caboose/variants/admin_group.html.erb

@@ -109,7 +109,7 @@
 <% end %>
 
 <% 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/layouts/caboose/admin.html.erb

@@ -11,7 +11,11 @@ if request.env['HTTP_CF_VISITOR'] && request.env['HTTP_CF_VISITOR'].include?('ht
 end
 
 content_for :admin_css do
-  %><%= stylesheet_link_tag "caboose/admin", :media => "all" %><%
+  %><%= stylesheet_link_tag "caboose/admin", :media => "all" %>
+  <%= stylesheet_link_tag "colorbox-rails", :media => "all" %>
+  <%= stylesheet_link_tag "caboose/model_binder", :media => "all" %>
+  <%# stylesheet_link_tag "caboose/page_bar_generator", :media => "all" %>
+  <%
   if File.exists?("#{Rails.root}/app/assets/stylesheets/admin.css")
     %><%= stylesheet_link_tag "admin", :media => "all" %><%
   end
@@ -27,7 +31,10 @@ if protocol == 'https://'
 end
 
 content_for :admin_js do
-  %><%= javascript_include_tag "caboose/admin" %><%
+  %>
+  <%= javascript_include_tag "caboose/admin" %>
+  <%= javascript_include_tag "caboose/jquery.detect" %>
+  <%
   %><%= yield :caboose_js %><%
 end
 

data/app/views/layouts/caboose/application.html.erb

@@ -1,41 +1,57 @@
 <% if @page && @page.title != 'Access Denied' %>
-<% content_for :js do %>
-<%= gzip_javascript_include_tag "caboose/application" %>
-<% if @site.theme %>
-  <script type='text/javascript' src="<%= @site.theme.js_url %>"></script>
-<% else %>
-  <%= gzip_javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
-<% end %>
-<script>window.loggedIn = <%= logged_in?.to_json %></script>
-<% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
-<% @page.linked_resources_map[:js].each do |r| %><%= gzip_javascript_include_tag r %><% end %>
-<% if @site.date_js_updated %><script type='text/javascript' src="<%= raw @site.custom_js_url %>"></script><% end %>
-<% if @page.custom_js_files && @page.custom_js_files.strip.length > 0 %>
-  <% @page.custom_js_files.split("\n").each do |url| %><script type='text/javascript' src="<%= raw url %>"></script><% end %>
-<% end %>
-<% if @page.custom_js && @page.custom_js.strip.length > 0 %><script type='text/javascript'><%= raw @page.custom_js %></script><% end %>
-<%= yield :caboose_js %>
-<% end %>
-<% content_for :css do %>
-<%= gzip_stylesheet_link_tag 'caboose/application' %>
-<% if @site.theme %>
-  <link rel='stylesheet' type='text/css' media='all' href="<%= @site.theme.asset_url(@site.id) %>" />
-<% else %>
-  <%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
-<% end %>
-<% Caboose::stylesheets.each do |css| %><%= gzip_stylesheet_link_tag(css) %><% end %>
-<% @page.linked_resources_map[:css].each do |r| %><%= gzip_stylesheet_link_tag r %><% end %>
-<% if @site.date_css_updated %><link rel='stylesheet' type='text/css' href="<%= raw @site.custom_css_url %>" /><% end %>
-<% if @page.custom_css_files && @page.custom_css_files.strip.length > 0 %>
-  <% @page.custom_css_files.split("\n").each do |url| %><link rel="stylesheet" type='text/css' href="<%= raw url %>" /><% end %>
-<% end %>
-<% if @page.custom_css && @page.custom_css.strip.length > 0 %><style><%= raw @page.custom_css %></style><% end %>
-<%= yield :caboose_css %>
-<% end %>
+  <% content_for :js do %>
+    <%= gzip_javascript_include_tag "caboose/application" %>
+    <% if @site.theme %>
+      <script type='text/javascript' src="<%= @site.theme.js_url(@site.id) %>"></script>
+    <% else %>
+      <%= gzip_javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
+    <% end %>
+    <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
+    <% if @site.date_js_updated %><script type='text/javascript' src="<%== @site.custom_js_url %>"></script><% end %>
+    <% if @page.custom_js_files && @page.custom_js_files.strip.length > 0 %>
+      <% @page.custom_js_files.split("\n").each do |url| %><script type='text/javascript' src="<%== url %>"></script><% end %>
+    <% end %>
+    <% if @page.custom_js && @page.custom_js.strip.length > 0 && (!@site.use_caching || @editing) %><script type='text/javascript'><%== @page.custom_js %></script><% end %>
+    <% if @site.use_caching && (!@editing || (@preview && @page.is_published)) %>
+      <% js_url = @page.js_url %>
+      <% if !js_url.include?('empty.js') && !@post %><script type='text/javascript' src="<%= js_url %>"></script><!-- page js --><% end %>
+    <% end %>
+    <% if @site.use_caching %>
+      <% footer_js_url = @site.footer_js_url %>
+      <% if !footer_js_url.include?('empty.js') && @page.parent_id != -1 %><script type='text/javascript' src="<%= footer_js_url %>"></script><!-- footer js --><% end %>
+    <% end %>
+    <% if !@site.custom_js_files.blank? && @page.parent_id != -1 %>
+      <% @site.custom_js_files.split("\n").each do |url| %><script type='text/javascript' src="<%== url %>"></script><% end %>
+    <% end %>
+    <%= yield :caboose_js %>
+  <% end %>
+  <% content_for :css do %>
+    <% if @site.theme %>
+      <link rel='stylesheet' type='text/css' media='all' href="<%= @site.theme.asset_url(@site.id) %>" />
+    <% else %>
+      <%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
+    <% end %>
+    <% if @site.use_caching && (!@editing || (@preview && @page.is_published)) %>
+      <% css_url = @page.css_url %>
+      <% if !css_url.include?('empty.css') && !@post %><link rel='stylesheet' type='text/css' media='all' href="<%= css_url %>" /><!-- page css --><% end %>
+    <% end %>
+    <% if @site.use_caching %>
+      <% footer_css_url = @site.footer_css_url %>
+      <% if !footer_css_url.include?('empty.css') && @page.parent_id != -1 %><link rel='stylesheet' type='text/css' media='all' href="<%= footer_css_url %>" /><!-- footer css --><% end %>
+    <% end %>
+    <% if !@site.custom_css_files.blank? && @page.parent_id != -1 %>
+      <% @site.custom_css_files.split("\n").each do |url| %><link rel="stylesheet" type='text/css' href="<%== url %>" /><% end %>
+    <% end %>
+    <% Caboose::stylesheets.each do |css| %><%= gzip_stylesheet_link_tag(css) %><% end %>
+    <% if @site.date_css_updated %><link rel='stylesheet' type='text/css' href="<%== @site.custom_css_url %>" /><% end %>
+    <% if @page.custom_css_files && @page.custom_css_files.strip.length > 0 %>
+      <% @page.custom_css_files.split("\n").each do |url| %><link rel="stylesheet" type='text/css' href="<%== url %>" /><% end %>
+    <% end %>
+    <% if @page.custom_css && @page.custom_css.strip.length > 0 && (!@site.use_caching || @editing) %><style><%== @page.custom_css %></style><% end %>
+    <%= yield :caboose_css %>
+  <% end %>
   <%  
   b = @post ? @post.block : @page.block
-  #Caboose.log(@post)
-  #Caboose.log(@page.block.inspect)
   if b.nil?
     bt = @site.default_layout
     if @post                    
@@ -47,7 +63,6 @@
     end
     b.create_children
   end
-  #b.log_helper
   options = {
     :request => @request,    
     :post => @post,    
@@ -66,63 +81,19 @@
     :ga_events => @ga_events
   }
   @block_options.each{ |k,v| options[k] = v } if @block_options  
-    
-  str = nil    
-  #if @use_page_cache
-  #  pc = Caboose::PageCache.where(:page_id => @page.id).first  
-  #  if pc # If the page is cached, send it to the user    
-  #         
-  #    require_dependency "#{Caboose.root}/app/models/caboose/block_cache.rb"
-  #    require_dependency "#{Caboose.root}/app/models/caboose/block_cache_file.rb"
-  #    require_dependency "#{Caboose.root}/app/models/caboose/block_cache_image.rb"
-  #  
-  #    @block = Marshal.load(pc.block)    
-  #    @view                    = options[:view                    ]
-  #    @controller_view_content = options[:controller_view_content ]
-  #    @modal                   = options[:modal                   ]
-  #    @empty_text              = options[:empty_text              ]
-  #    @editing                 = options[:editing                 ]
-  #    @css                     = options[:css                     ]
-  #    @js                      = options[:js                      ]
-  #    @csrf_meta_tags          = options[:csrf_meta_tags          ]
-  #    @csrf_meta_tags2         = options[:csrf_meta_tags2         ]
-  #    
-  #    str = render(:inline => pc.render_function)            
-  #  end
-  #end
-  
-  # Render the blocks if we don't have it cached    
   str = b.render(b, options) if str.nil?
-        
-  protocol = request.protocol
-  #protocol = Caboose.plugin_hook('request_protocol', protocol, request)
-  
-  # See if we're using cloudflare
-  if request.env['HTTP_CF_VISITOR'] && request.env['HTTP_CF_VISITOR'].include?('https')
-    protocol = 'https://'
-    request.env['REQUEST_URI']     = "https://#{request.env['REQUEST_URI'][7..-1]}" if (request.env['REQUEST_URI'] =~ %r"http://") == 0    
-    request.env['SERVER_PORT']     = '443' if request.env['SERVER_PORT'] == '80'
-    request.env['HTTP_REFERER']    = "https://#{request.env['HTTP_REFERER'][7..-1]}" if (request.env['HTTP_REFERER'] =~ %r"http://") == 0    
-    request.env['rack.url_scheme'] = 'https'
-    request.env['HTTPS']           = 'on'
-  end
+  protocol = "https://"
   
   css = b.partial('ga', options)
   css << yield(:css)
-  css.gsub!("<link href=\"//", "<link href=\"#{protocol}")
-  css.gsub!("<link href='//" , "<link href='#{protocol}")
-  if protocol == 'https://' 
-    css.gsub!("<link href=\"http://", "<link href=\"https://")
-    css.gsub!("<link href='http://" , "<link href='https://")
-  end
+  css << raw(@post ? @post.cached_css : @page.cached_css) if @post || (@site.use_caching && @editing && !@preview && (@post ? @post.is_published : @page.is_published))
+  css.gsub!("<link href=\"http://", "<link href=\"https://")
+  css.gsub!("<link href='http://" , "<link href='https://")
 
   js = yield(:js)
-  js.gsub!("<script src=\"//", "<script src=\"#{protocol}")
-  js.gsub!("<script src='//" , "<script src='#{protocol}")
-  if protocol == 'https://' 
-    js.gsub!("<script src=\"http://", "<script src=\"https://")
-    js.gsub!("<script src='http://" , "<script src='https://")
-  end
+  js << raw(@post ? @post.cached_js : @page.cached_js) if @post || (@site.use_caching && @editing && !@preview && (@post ? @post.is_published : @page.is_published))
+  js.gsub!("<script src=\"http://", "<script src=\"https://")
+  js.gsub!("<script src='http://" , "<script src='https://")
   if @site.use_retargeting
     js << b.partial('retargeting', options)
   end
@@ -130,8 +101,7 @@
   str.gsub!('|CABOOSE_CSS|'        , css)
   str.gsub!('|CABOOSE_PROTOCOL|'   , protocol)  
   str.gsub!('|CABOOSE_JAVASCRIPT|' , js)  
-  str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)  
-  
-  %><%= raw str %><%
-end
-%>
+  str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)
+  %>
+<%== str %>
+<% end %>

data/app/views/layouts/caboose/css.css.erb

@@ -0,0 +1,44 @@
+<% if @page.custom_css && !@page.custom_css.blank? %>
+<%== @page.custom_css %>
+<% end %>
+<%
+css = ''
+css << raw(@post ? @post.cached_css : @page.cached_css) if @site.use_caching
+if !css.blank?
+  css = css.gsub('<style>','')
+  css = css.gsub('</style>','')
+  links = css.scan(/@import(\s)*url\(('|")(http(s)?:)?(\/\/[A-z 0-9?=@._\-\/]*)('|")\);/).flatten
+  links2 = css.scan(/<link href=('|")(http(s)?:)?(\/\/[A-z 0-9?=@._\-\/]*)('|")([A-z 0-9@?="'\/]*)\/>/).flatten
+  css_files = []
+  if links && links.length > 0
+    links.to_a.each do |link|
+      if !link.blank? && link.include?('.css') && !link.include?('@import')
+        if !css_files.include?(link)
+          css_files << link
+        end
+      end
+    end
+  end
+  if links2 && links2.length > 0
+    links2.to_a.each do |link|
+      if !link.blank? && link.include?('.css') && !link.include?('media')
+        if !css_files.include?(link)
+          css_files << link
+        end
+      end
+    end
+  end
+  str = @page.custom_css_files.blank? ? '' : @page.custom_css_files
+  css_files.each do |csf|
+    str += "\n" if !str.blank? && !str.include?(csf)
+    str += "#{csf}" if !str.include?(csf)
+  end
+  @page.custom_css_files = str
+  @page.save
+  if !css.blank?
+    css = css.gsub(/@import(\s)*url\(('|")(http(s)?:)?(\/\/[A-z 0-9?=@._\-\/]*)('|")\);/,'')
+    css = css.gsub(/<link href=('|")(http(s)?:)?(\/\/[A-z 0-9?=@._\-\/]*)('|")([A-z 0-9@?="'\/]*)\/>/,'')
+  end
+%>
+<%== css %>
+<% end %>