caboose-cms 0.6.22 → 0.6.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDJlNjMyNDg2NTIwNWRjMTNiZjYxMDFmNDY5NzkxMTc4MzJjOTczZQ==
+    N2M5ZDYwMzJmZWIwMmE0NTllOGQ1Yjk5MTI4ODhhNTU0YjZhN2NkZg==
   data.tar.gz: !binary |-
-    NWZlMjMzNDAyMjRlOWY2MzA3MjE0YzYyYzJkMDM1YWQ0NmE2YmU1NQ==
+    YmI3YjAyMDk2NThjNGFkNzliYjQ2YWRhZGZlMzM5ODBhODBkMmU5Mg==
 SHA512:
   metadata.gz: !binary |-
-    NjczMDJhZTc4MGZlOGViYWFjMjg4YTMzYjdiNzcxNzVkYTUwM2FkYTRmYzI2
-    YzhiOGE5OGNiYWUzZTA5ZTQwMGU2ZjJhMTZjZTA5YTRhNjM2ZDM2YWEyYWRh
-    YTUyNmZmNjAyY2UxN2I1Y2M2Mjk2YzhiMTYyNjg1YjFkZWViMDY=
+    ZjIxYzg3MmIyNmEyZGQxYmRhNGQ1NzFjZjA0Yzg3NzkxZDgwNjk3YmNmNGYx
+    YzM0MjM3MjliZjIzNGMxYzU0NDc4NTcwODc3MzE0MDVlYjIxZDY5NDU1ZmU0
+    NzQ5OWM2MGExZmNkZGNiMzY3ZDRhNmQ2ZDRjZjEzYjkzYmUyZDA=
   data.tar.gz: !binary |-
-    ZjEyNTU2MTE1YjFiMjE0ZmExMDBlNmJjMzIzMTA4M2JkZjc5M2YyOWNhM2Uz
-    OTcxNmE4NjNjMjBmNGQ1MWQzNzU3MGU4YjQ0OWFmNGI4YTE3N2E2Y2UwMWM3
-    OGQ4MTNiNzM0Nzg2MzA1YzFlNTliYjdlMTFiZTg2NGU1YTljZDM=
+    NzUxMzMxZWQ0YzcxNTFmOTllZmE2MzI4NzE3OTc1NjA0MGYwMjM0YTEwNGVl
+    MmM0NzFkMzI3NGJkNzE4MjhmZGMwMDgxOTQ1ZGVlODZmMmNmYzllZTgyM2Uy
+    Y2Q3ZjI1ZTQ4ZTI4NThlZjQ4YTA1M2UxZWQ3MTg2MTg0NWFjYTA=

data/app/assets/javascripts/caboose/product.js

@@ -54,9 +54,12 @@ Caboose.Store.Modules.Product = (function() {
   self.initalize_zoom = function(image_url) {
     var big_image = $("#product-images").children("figure").first();
     big_image.data("zoom-image",image_url);
-    if (typeof elevateZoom !== 'undefined') {
+    try {
       big_image.elevateZoom();
     }
+    catch(err) {
+      console.log("Missing image zoom script.");
+    }
   }
   
   self.render_images = function(callback) {

data/app/controllers/caboose/login_logs_controller.rb

@@ -6,12 +6,26 @@ module Caboose
     def before_action
       @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
-            
+    
     # GET /admin/login-logs
-    def index
-      return if !user_is_allowed('users', 'view')
-      
-      @gen = PageBarGenerator.new(params, {
+    def admin_index
+      return if !user_is_allowed_to 'view', 'loginlogs'
+      @pager = self.login_logs_pager    
+      render :layout => 'caboose/admin'    
+    end
+    
+    # GET /admin/login-logs/json
+    def admin_json
+      return if !user_is_allowed_to 'view', 'loginlogs'
+      pager = self.login_logs_pager        
+      render :json => {
+        :pager => pager,
+        :models => pager.items
+      }      
+    end
+    
+    def login_logs_pager
+      return Caboose::Pager.new(params, {
           'site_id'            => @site.id,
           'username_like'      => '',
           'user_id'            => '',
@@ -23,11 +37,25 @@ module Caboose
     		  'model'          => 'Caboose::LoginLog',
     	    'sort'			     => 'date_attempted',
     		  'desc'			     => false,
+    		  'items_per_page' => 100,
     		  'base_url'		   => '/admin/login-logs',
     		  'use_url_params' => false
-    	})
-    	@logs = @gen.items
-    end       
+    	})    	
+    end
+    
+    # GET /admin/login-logs/:id/json
+    def admin_json_single
+      return if !user_is_allowed_to 'view', 'loginlogs'
+      login_log = LoginLog.find(params[:id])      
+      render :json => login_log
+    end
+    
+    # GET /admin/login-logs/:id
+    def admin_edit
+      return if !user_is_allowed_to 'edit', 'loginlogs'
+      @login_log = LoginLog.find(params[:id])
+	    render :layout => 'caboose/admin'
+    end
     
   end
 end

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

@@ -1,41 +1,41 @@
-<h1>Login Logs</h1>
-
-<form action='/admin/users' method='get' class='search_form'>
-<input type='text' name='first_name_like' value="<%= @gen.params['first_name_like'] %>" placeholder='First name' />
-<input type='text' name='last_name_like'  value="<%= @gen.params['last_name_like']  %>" placeholder='Last name' />
-<input type='text' name='email_like'      value="<%= @gen.params['email_like']      %>" placeholder='Email' />
-<input type='submit' value='Search' />
-</form>
-
-<p>
-<a href='/admin/users/new'>New User</a> |
-<a href='/admin/users/import'>Import CSV</a>
-</p>
-
-<table class='data' id='users_table'>
-  <tr>
-    <%= raw @gen.sortable_table_headings({
-				'first_name' => 'First Name',
-				'last_name, first_name'	=> 'Last Name',
-				'username' => 'Username',
-				'email'	=> 'Email'
-			})
-		%>
-  </tr>
-<% @users.each do |user| %>
-  <tr onclick="window.location='/admin/users/<%= user.id %>';">
-    <td><%= user.first_name %></td>
-    <td><%= user.last_name %></td>
-    <td><%= user.username %></td>
-    <td><%= user.email %></td>
-  </tr>
-<% end %>
-</table>
 
-<p><%= raw @gen.generate %></p>
+<h1>Login Logs</h1>
+<div id='login_logs'></div>
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
 <script type='text/javascript'>
 
+$(document).ready(function() {
+  var that = this;
+  var table = new IndexTable({    
+    form_authenticity_token: '<%= form_authenticity_token %>',
+    container: 'login_logs',
+    base_url: '/admin/login-logs',
+    allow_add: false,
+    allow_bulk_import: false,
+    allow_bulk_edit: false,
+    allow_bulk_delete: false,
+    allow_duplicate: false,
+    allow_advanced_edit: false,
+    fields: [       
+      { show: true, name: 'username'        , nice_name: 'Username'   , sort: 'username'       , type: 'text'     , value: function(ll) { return ll.username       }, width: 150, align: 'left', bulk_edit: false, editable: false },
+      { show: true, name: 'user_id'         , nice_name: 'User ID'    , sort: 'user_id'        , type: 'text'     , value: function(ll) { return ll.user_id        }, width: 150, align: 'left', bulk_edit: false, editable: false },    
+      { show: true, name: 'date_attempted'  , nice_name: 'Date'       , sort: 'date_attempted' , type: 'text'     , value: function(ll) { return ll.date_attempted }, width: 150, align: 'left', bulk_edit: false, editable: false },
+      { show: true, name: 'ip'              , nice_name: 'IP Address' , sort: 'ip'             , type: 'text'     , value: function(ll) { return ll.ip             }, width: 150, align: 'left', bulk_edit: false, editable: false },
+      { show: true, name: 'success'         , nice_name: 'Success'    , sort: 'success'        , type: 'checkbox' , value: function(ll) { return ll.success        }, width: 150, align: 'left', bulk_edit: false, editable: false }            
+    ],
+    search_fields: [
+      { name: 'username_like'       , nice_name: 'Username'   , type: 'text'     , width: 150, align: 'left' },
+      { name: 'user_id'             , nice_name: 'User ID'    , type: 'text'     , width: 150, align: 'left' },    
+      { name: 'date_attempted_gte'  , nice_name: 'Date Min'   , type: 'text'     , width: 150, align: 'left' },
+      { name: 'date_attempted_lte'  , nice_name: 'Date Max'   , type: 'text'     , width: 150, align: 'left' },
+      { name: 'ip_like'             , nice_name: 'IP Address' , type: 'text'     , width: 150, align: 'left' },
+      { name: 'success'             , nice_name: 'Success'    , type: 'checkbox' , width: 150, align: 'left' }      
+    ],
+    no_models_text: "There are no login logs right now."
+  });        
+});
+
 </script>
-<% end %>
+<% end %>

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

@@ -0,0 +1,2 @@
+<br style='clear: left; line-height: 0;' />
+</div><!-- modal_content2 -->

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

@@ -0,0 +1,25 @@
+<% content_for :caboose_css do %>
+<% end %>
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<% end %>
+
+<h1>Edit Advertiser</h1>
+<ul id='tabs'>
+<%
+tabs = {                             
+  'General'            => "/admin/advertisers/#{@advertiser.id}",
+  'Authorize.net Info' => "/admin/advertisers/#{@advertiser.id}/authnet",
+  'Users'              => "/admin/advertisers/#{@advertiser.id}/users",
+  'Campaigns'          => "/admin/advertisers/#{@advertiser.id}/campaigns",  
+  'Invoices'           => "/admin/advertisers/#{@advertiser.id}/invoices",
+  'Delete'             => "/admin/advertisers/#{@advertiser.id}/delete"  
+}
+%>
+<% tabs.each do |text, href| %>
+<% selected = true if request.fullpath == href || (text != 'General' && request.fullpath.starts_with?(href)) %>
+<li<% if selected %> class='selected'<% end %>><a href='<%= href %>'><%= raw text %></a></li>
+<% end %>
+<li class='back'><input type='button' value='< Back' onclick="window.location='/admin/advertisers';" /></li>
+</ul>
+<div id='content2'>

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

@@ -19,9 +19,10 @@ pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150" #&d=/assets/caboose/
 </div>
 <div id='message'></div>
 <div id='controls'>
-<input type='button' value='Back'           onclick="window.location='/admin/users';" />
-<input type='button' value='Reset Password' onclick="window.location='/admin/users/<%= @edituser.id %>/edit-password';" />
-<input type='button' value='Delete User'    onclick="delete_user(<%= @edituser.id %>);" />
+<input type='button' value='Back'                     onclick="window.location='/admin/users';" />
+<input type='button' value='Login Logs for this User' onclick="window.location='/admin/login-logs?user_id=<%= @edituser.id %>';" />
+<input type='button' value='Reset Password'           onclick="window.location='/admin/users/<%= @edituser.id %>/edit-password';" />
+<input type='button' value='Delete User'              onclick="delete_user(<%= @edituser.id %>);" />
 </div>
 
 <% content_for :caboose_css do %>

data/config/routes.rb

@@ -79,6 +79,13 @@ Caboose::Engine.routes.draw do
   delete  "/admin/sites/:site_id/domains/:id"       => "domains#admin_delete"
   put     "/admin/sites/:site_id/domains/:id/set-primary" => "domains#admin_set_primary"
         
+  #=============================================================================
+  # Login Logs
+  #=============================================================================
+    
+  get "/admin/login-logs/json"      => "login_logs#admin_json"  
+  get "/admin/login-logs"           => "login_logs#admin_index"
+    
   #=============================================================================
   # Store
   #=============================================================================  

data/lib/caboose.rb

@@ -14,7 +14,10 @@ module Caboose
   
   mattr_accessor :plugins
   @@plugins = ['Caboose::CorePlugin']
-
+  
+  mattr_accessor :schemas
+  @@schemas = ['Caboose::Schema', 'Schema']
+  
   # Any paths to modeljs javascript files  
   mattr_accessor :modeljs_js_files
   @@modeljs_js_files = []

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.22'
+  VERSION = '0.6.23'
 end

data/lib/tasks/caboose.rake

@@ -151,12 +151,18 @@ namespace :caboose do
     
   desc "Creates/verifies that all database tables and fields are correctly added."
   task :db => :environment do
-    Caboose::Schema.create_schema
-    Caboose::Schema.load_data    
-    if class_exists?('Schema')
-      Schema.create_schema
-      Schema.load_data
+    Caboose::schemas.each do |schema_class|
+      S = schema_class.constantize
+      S.create_schema
+      S.load_data
     end
+      
+    #Caboose::Schema.create_schema
+    #Caboose::Schema.load_data    
+    #if class_exists?('Schema')
+    #  Schema.create_schema
+    #  Schema.load_data
+    #end
     caboose_correct_sequences
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.22
+  version: 0.6.23
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1012,6 +1012,8 @@ files:
 - app/views/caboose/store/admin_edit_payment.html.erb
 - app/views/caboose/store/admin_edit_shipping.html.erb
 - app/views/caboose/store/admin_edit_tax.html.erb
+- app/views/caboose/users/_admin_footer.html.erb
+- app/views/caboose/users/_admin_header.html.erb
 - app/views/caboose/users/edit.html.erb
 - app/views/caboose/users/edit_password.html.erb
 - app/views/caboose/users/import_form.html.erb