caboose-cms 0.9.166 → 0.9.167

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

@@ -9,12 +9,12 @@
 <%
 tabs = {                             
   'General'         => "/admin/users/#{@edituser.id}",
-  'Login Logs'      => "/admin/login-logs?user_id=#{@edituser.id}",
+  'Login Logs'      => "/admin/login-logs/user/#{@edituser.id}",
   'Password'        => "/admin/users/#{@edituser.id}/password",
   'Roles'           => "/admin/users/#{@edituser.id}/roles",
   'Delete'          => "/admin/users/#{@edituser.id}/delete"  
 }
-if @site.use_store || @site.is_master
+if @site.use_store
 	arr = tabs.to_a.insert(1, ['Payment Method', "/admin/users/#{@edituser.id}/payment-method"])
 	tabs = Hash[arr]
   arr = tabs.to_a.insert(2, ['Invoices', "/admin/users/#{@edituser.id}/invoices"])

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

@@ -1,8 +1,6 @@
 
 <%= render :partial => 'caboose/users/admin_header' %>
 
-<h1>Delete User</h1>
-
 <div id='message'>
 <input type='button' value='Delete User'              onclick="delete_user(<%= @edituser.id %>);" />
 </div>

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

@@ -1,19 +1,29 @@
 <% 
 gravatar_id = Digest::MD5.hexdigest(@edituser.email.downcase)
-pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150" #&d=/assets/caboose/default_user_pic.png"  
+pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150"
+pic = @edituser.image.url(:thumb) if @edituser.image && !@edituser.image.url.include?('placehold')
 %>
 
 <%= render :partial => 'caboose/users/admin_header' %>
 
+<h3 style="margin:0;">General Information</h3>
+
 <div class="user-details-wrapper clearfix">
   <div class="gravatar-holder">
-    <p id='gravatar'><img src='<%= pic %>' /><a href='http://gravatar.com'>Update on gravatar</a></p>
+    <p id='gravatar'><img src='<%= pic %>' width="150" /></p>
   </div>
   <div class="mb-holder">
     <p><div id='user_<%= @edituser.id %>_first_name' ></div></p>
     <p><div id='user_<%= @edituser.id %>_last_name'  ></div></p>
     <p><div id='user_<%= @edituser.id %>_username'   ></div></p>
     <p><div id='user_<%= @edituser.id %>_email'      ></div></p>
+    <p><div id='user_<%= @edituser.id %>_phone'      ></div></p>
+    <p><div id='user_<%= @edituser.id %>_fax'      ></div></p>
+    <p><div id='user_<%= @edituser.id %>_address'      ></div></p>
+    <p><div id='user_<%= @edituser.id %>_address2'      ></div></p>
+    <p><div id='user_<%= @edituser.id %>_city'      ></div></p>
+    <p><div id='user_<%= @edituser.id %>_state'      ></div></p>
+    <p><div id='user_<%= @edituser.id %>_zip'      ></div></p>
     <p><div id='user_<%= @edituser.id %>_locked'     ></div></p>
   </div>
 </div>
@@ -51,11 +61,18 @@ $(document).ready(function() {
     update_url: '/admin/users/<%= @edituser.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'first_name' , nice_name: 'First name', type: 'text'     , value: <%= raw Caboose.json(@edituser.first_name) %>, width: 350 },
-      { name: 'last_name'  , nice_name: 'Last name' , type: 'text'     , value: <%= raw Caboose.json(@edituser.last_name)  %>, width: 350 },
-      { name: 'username'   , nice_name: 'Username'  , type: 'text'     , value: <%= raw Caboose.json(@edituser.username)   %>, width: 350 },
-      { name: 'email'      , nice_name: 'Email'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.email)      %>, width: 350 },
-      { name: 'locked'     , nice_name: 'Locked'    , type: 'checkbox' , value: <%= @edituser.locked ? 1 : 0               %>, width: 350 }
+      { name: 'first_name' , nice_name: 'First name', type: 'text'     , value: <%= raw Caboose.json(@edituser.first_name) %>, width: 400 },
+      { name: 'last_name'  , nice_name: 'Last name' , type: 'text'     , value: <%= raw Caboose.json(@edituser.last_name)  %>, width: 400 },
+      { name: 'username'   , nice_name: 'Username'  , type: 'text'     , value: <%= raw Caboose.json(@edituser.username)   %>, width: 400 },
+      { name: 'email'      , nice_name: 'Email'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.email)      %>, width: 400 },
+      { name: 'phone'      , nice_name: 'Phone'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.phone)      %>, width: 400 },
+      { name: 'fax'      , nice_name: 'Fax'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.fax)      %>, width: 400 },
+      { name: 'address'      , nice_name: 'Address'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.address)      %>, width: 400 },
+      { name: 'address2'      , nice_name: 'Address 2'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.address2)      %>, width: 400 },
+      { name: 'city'      , nice_name: 'City'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.city)      %>, width: 400 },
+      { name: 'state'      , nice_name: 'State'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.state)      %>, width: 400 },
+      { name: 'zip'      , nice_name: 'Zip'     , type: 'text'     , value: <%= raw Caboose.json(@edituser.zip)      %>, width: 400 },
+      { name: 'locked'     , nice_name: 'Locked'    , type: 'checkbox' , value: <%= @edituser.locked ? 1 : 0               %>, width: 400 }
     ]    
   });  
 });

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

@@ -1,7 +1,7 @@
 
 <%= render :partial => 'caboose/users/admin_header' %>
 
-<h2>Reset Password for <%= "#{@edituser.first_name} #{@edituser.last_name}" %></h2>
+<h3 style="margin:0 0 10px 0;">Reset Password</h3>
 <form action='/admin/users/<%= @edituser.id %>' method='put' id='password_form'>
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
 <div class="field">

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

@@ -1,6 +1,8 @@
 
 <%= render :partial => 'caboose/users/admin_header' %>
 
+<h3 style="margin:0 0 10px 0;">Roles</h3>
+
 <div id='roles'>
 <table class='data'>
 <% Caboose::Role.flat_tree(@site.id).each do |r| %>

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

@@ -1,7 +1,11 @@
 <% if @page && @page.title != 'Access Denied' %>
 <% content_for :js do %>
 <%= gzip_javascript_include_tag "caboose/application" %>
+<% if @site.theme %>
+<%= gzip_javascript_include_tag(@site.theme.js_url) %>
+<% 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 %>
@@ -14,7 +18,11 @@
 <% end %>
 <% content_for :css do %>
 <%= gzip_stylesheet_link_tag 'caboose/application' %>
+<% if @site.theme %>
+<%= gzip_stylesheet_link_tag(@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 %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.166'
+  VERSION = '0.9.167'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.166
+  version: 0.9.167
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -722,6 +722,7 @@ files:
 - app/controllers/caboose/page_custom_field_values_controller.rb
 - app/controllers/caboose/page_custom_fields_controller.rb
 - app/controllers/caboose/page_permissions_controller.rb
+- app/controllers/caboose/page_templates_controller.rb
 - app/controllers/caboose/pages_controller.rb
 - app/controllers/caboose/permissions_controller.rb
 - app/controllers/caboose/post_categories_controller.rb
@@ -746,6 +747,7 @@ files:
 - app/controllers/caboose/station_controller.rb
 - app/controllers/caboose/store_controller.rb
 - app/controllers/caboose/subscriptions_controller.rb
+- app/controllers/caboose/themes_controller.rb
 - app/controllers/caboose/users_controller.rb
 - app/controllers/caboose/variant_children_controller.rb
 - app/controllers/caboose/variant_limits_controller.rb
@@ -833,6 +835,8 @@ files:
 - app/models/caboose/page_custom_field_value.rb
 - app/models/caboose/page_permission.rb
 - app/models/caboose/page_tag.rb
+- app/models/caboose/page_template.rb
+- app/models/caboose/page_template_category.rb
 - app/models/caboose/pager.rb
 - app/models/caboose/payment_processors/authorizenet.rb
 - app/models/caboose/payment_processors/base.rb
@@ -874,6 +878,7 @@ files:
 - app/models/caboose/subscription.rb
 - app/models/caboose/tax_calculator.rb
 - app/models/caboose/tax_line.rb
+- app/models/caboose/theme.rb
 - app/models/caboose/user.rb
 - app/models/caboose/utilities/schema.rb
 - app/models/caboose/variant.rb
@@ -1041,6 +1046,7 @@ files:
 - app/views/caboose/login/index.html.erb
 - app/views/caboose/login/reset_password_form.html.erb
 - app/views/caboose/login_logs/admin_index.html.erb
+- app/views/caboose/login_logs/admin_index_for_user.html.erb
 - app/views/caboose/login_mailer/forgot_password_email.html.erb
 - app/views/caboose/login_mailer/locked_account.html.erb
 - app/views/caboose/media/admin_edit.html.erb
@@ -1057,6 +1063,9 @@ files:
 - app/views/caboose/my_account_invoices/payment_form.html.erb
 - app/views/caboose/page_custom_fields/admin_edit.html.erb
 - app/views/caboose/page_custom_fields/admin_index.html.erb
+- app/views/caboose/page_templates/admin_edit.html.erb
+- app/views/caboose/page_templates/admin_index.html.erb
+- app/views/caboose/page_templates/admin_new.html.erb
 - app/views/caboose/pages/_admin_footer.html.erb
 - app/views/caboose/pages/_admin_header.html.erb
 - app/views/caboose/pages/_content.html.erb
@@ -1074,6 +1083,7 @@ files:
 - app/views/caboose/pages/admin_edit_seo.html.erb
 - app/views/caboose/pages/admin_index.html.erb
 - app/views/caboose/pages/admin_new.html.erb
+- app/views/caboose/pages/admin_new_old.html.erb
 - app/views/caboose/pages/admin_sitemap.html.erb
 - app/views/caboose/pages/preview.html.erb
 - app/views/caboose/pages/show.html.erb
@@ -1165,6 +1175,7 @@ files:
 - app/views/caboose/subscriptions/admin_edit.html.erb
 - app/views/caboose/subscriptions/admin_index.html.erb
 - app/views/caboose/subscriptions/admin_user_index.html.erb
+- app/views/caboose/themes/admin_edit.html.erb
 - app/views/caboose/users/_admin_footer.html.erb
 - app/views/caboose/users/_admin_header.html.erb
 - app/views/caboose/users/admin_delete_form.html.erb