caboose-cms 0.7.79 → 0.7.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00453379cb02022fc089c8d993f6e0c6a097f1b2
-  data.tar.gz: 22dc0b8de09ba87b6b97a4de20b53f7913c1b7a8
+  metadata.gz: 4bd2b52001e41aff8f4b36f2ddb73f81a7413475
+  data.tar.gz: 5306fa69c2584768d96091eea8d8447c81f0e911
 SHA512:
-  metadata.gz: c9b824d2fcc519a9eb2e16a6af49d4bc792f4960d041b722d94a4e75e557e39365936713b5612ee27357753c1e2c46089e17cb6a585ae25b6e0e4b42383bb615
-  data.tar.gz: d4ea4b5f3ec96cf1f456ed4f0c7702539030fbc44da813da201264f419b97c5f100b4bc9723fca478467095b25fab0171ef5bd74ef4de9434574c041343bb94d
+  metadata.gz: 1d3adcda361933fd03b6947823d55077b4c09f9279f9a0d89995dbd4cee470d85799aee12e5f9b9b0773ca337e74a97b242920272ffedf4d4d9387d77b41a584
+  data.tar.gz: 589cece85814a30dac022c3dd957003a6b631799cc3982c5b90106f53423ab45d9d02ed7d7a23365b883c82a549089a2170582bf90d4b7efe9a65af0ca88432d

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

@@ -29,6 +29,8 @@ MediaController.prototype = {
         .append($('<a/>').attr('href', '#').html('Upload').click(function(e) { e.preventDefault(); that.toggle_uploader(); }))
         .append(' | ')
         .append($('<a/>').attr('href', '#').html('Select All').click(function(e) { e.preventDefault(); that.select_all_media(); }))
+        .append(' | ')
+        .append($('<a/>').attr('href', '#').attr('id', 'sort-btn').html('Sort').click(function(e) { e.preventDefault(); that.sort_media(); }))
       )
       .append($('<div/>').attr('id', 'the_uploader'));          
     that.refresh();        
@@ -41,6 +43,56 @@ MediaController.prototype = {
     that.refresh_media();
     that.print_controls();    
   },
+
+  change_sort_order: function(list) {
+    var that = this;
+   // console.log(list.toString());
+    $.ajax({
+      url: '/admin/media-categories/' + that.cat_id + '/sort-order',
+      type: 'put',
+      data: {
+        sort: list
+      },
+      success: function(resp) { 
+        console.log("success");
+      }        
+    });
+  },
+
+  sort_media: function() {
+    var that = this;
+    var btn = $("#sort-btn");
+    if ( btn.text() == "Sort" ) {
+      $("li.media").draggable("disable");
+      $("#sort-btn").text("Done Sorting");
+      $("li.media").css("cursor","move");
+      $("#media ul").sortable({
+        update: function(event, ui) {
+          var index = ui.item.index();
+          var start = ui.item.data('start');
+          var media_id = ui.item.attr("id").replace("media","");
+          var sort_list = [];
+          for(var i=1;i <= $("#media ul li").length; i++) {
+          //  console.log(i);
+            var m = $('#media ul li:nth-child(' + i + ')').attr('id').replace("media","");
+          //  if (m) {
+              sort_list.push(m);
+         //   }
+          }
+          that.change_sort_order(sort_list);
+        }
+      });
+      $("#media ul").sortable('enable');
+      $("#media ul li").css("border-color","#98FF97");
+    }
+    else if ( btn.text() == "Done Sorting") {
+      $("#media ul").sortable("disable");
+      $("li.media").draggable("enable");
+      $("li.media").css("cursor","default");
+      $("#sort-btn").text("Sort");
+      $("#media ul li").css("border-color","#666");
+    }
+  },
       
   toggle_uploader: function()
   {
@@ -299,7 +351,8 @@ MediaController.prototype = {
         revert: 'invalid',
         start: function() { $(this).data("origPosition", $(this).position()); }
       });
-    });    
+    });
+  //  $("#media ul").sortable();
   },     
   
   //============================================================================
@@ -320,14 +373,6 @@ MediaController.prototype = {
     }        
     
     
-    
-    
-    
-    
-    
-    
-    
-    
   },
   
   select_all_media: function()
@@ -422,7 +467,8 @@ MediaController.prototype = {
     var that = this;
     that.cat_id = cat_id;
     that.print_categories();
-    that.refresh_media();        
+    that.refresh_media();
+    $("#sort-btn").text("Sort");
   },
   
   add_category: function(name)

data/app/controllers/caboose/media_categories_controller.rb

@@ -32,6 +32,21 @@ module Caboose
       render :json => Caboose::MediaCategory.tree_hash(@site.id)
     end
 
+    # PUT /admin/media-categories/:id/sort-order
+    def admin_update_sort_order
+      return unless user_is_allowed('mediacategories', 'edit')     
+      resp = Caboose::StdClass.new 
+      mc = MediaCategory.find(params[:id])
+      sort = params[:sort].to_a
+      sort.each_with_index do |s,i|
+        m = Media.where(:id => s.to_i).first
+        m.sort_order = i
+        m.save
+      end
+      resp.success = true
+      render :json => resp
+    end
+
     # POST /admin/media-categories
     def admin_add
       return unless user_is_allowed('mediacategories', 'add')

data/app/controllers/caboose/media_controller.rb

@@ -44,7 +44,6 @@ module Caboose
     def admin_json
       return if !user_is_allowed('media', 'view')
       render :json => false and return if @site.nil?
-      
       id = params[:media_category_id]        
       cat = id ? MediaCategory.find(id) : MediaCategory.top_category(@site.id)      
       render :json => cat.api_hash
@@ -93,6 +92,7 @@ module Caboose
         case name
           when 'name'         then m.name         = value
           when 'description'  then m.description  = value
+          when 'sort_order'   then m.sort_order   = value
           when 'image_url'    then
             m.processed = false
             m.delay.download_image_from_url(value)
@@ -175,7 +175,8 @@ module Caboose
       end
       m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name).first
       if m.nil?
-        m = Media.create(:media_category_id => media_category_id, :original_name => original_name, :name => name, :image_content_type => image_content_type, :file_content_type => file_content_type, :processed => false)
+        max = Media.where(:media_category_id => media_category_id).maximum(:sort_order)
+        m = Media.create(:media_category_id => media_category_id, :sort_order => (max ? (max + 1) : 0), :original_name => original_name, :name => name, :image_content_type => image_content_type, :file_content_type => file_content_type, :processed => false)
       end
       p = Product.where(:media_category_id => media_category_id).last
       if p

data/app/controllers/caboose/settings_controller.rb

@@ -12,7 +12,8 @@ module Caboose
       
       @gen = PageBarGenerator.new(params, {
     		  'name'        => nil,
-    		  'value'       => nil
+    		  'value'       => nil,
+          'site_id'     => @site.id
     		},{
     		  'model'       => 'Caboose::Setting',
     	    'sort'			  => 'name',

data/app/controllers/caboose/social_controller.rb

@@ -1,3 +1,5 @@
+require 'httparty'
+
 module Caboose
   class SocialController < ApplicationController
     layout 'caboose/admin'
@@ -43,6 +45,55 @@ module Caboose
     	resp.success = save && sc.save
     	render :json => resp
     end
+
+
+    # GET /api/instagram
+    def authorize_instagram
+      code = params[:code]
+      site_id = params[:state]
+      site = Site.where(:id => site_id).first
+      master_site = Site.where(:is_master => true).first
+      master_domain = master_site ? (master_site.primary_domain ? master_site.primary_domain.domain : 'caboosecms.com') : 'caboosecms.com'
+      domain = site ? (site.primary_domain ? site.primary_domain.domain : 'www.caboosecms.com') : 'www.caboosecms.com'
+      resp = HTTParty.post(
+        'https://api.instagram.com/oauth/access_token',
+        :body => {
+          :client_id => 'bac12987b6cb4262a004f3ffc388accc',
+          :client_secret => 'ede277a5b2df47fe8efcb69a9fac8e07',
+          :grant_type => 'authorization_code',
+          :redirect_uri => 'http://' + master_domain + '/api/instagram',
+          :code => code
+        }
+      )
+      if resp
+        if resp['code'] && (resp['code'] == 400 || resp['code'] = '400')
+          redirect_to 'http://' + domain + '/admin/social?instagram=fail'
+        elsif !resp['access_token'].blank?
+          sc = SocialConfig.where(:site_id => site_id).first
+          sc.instagram_access_token = resp['access_token']
+          sc.instagram_user_id = resp['user']['id']
+          sc.instagram_username = resp['user']['username']
+          sc.save
+          redirect_to 'http://' + domain + '/admin/social?instagram=success'
+        end
+      else
+        redirect_to 'http://' + domain + '/admin/social?instagram=fail'
+      end      
+    end
+
+    # DELETE /api/instagram
+    def deauthorize_instagram
+      resp = StdClass.new     
+      site_id = params[:site_id]
+      site = Site.where(:id => site_id).first
+      sc = SocialConfig.where(:site_id => site.id).first
+      sc.instagram_username = nil
+      sc.instagram_user_id = nil
+      sc.instagram_access_token = nil
+      sc.save
+      resp.success = true
+      render :json => resp
+    end
     
   end
 end

data/app/models/caboose/media.rb

@@ -23,7 +23,8 @@ class Caboose::Media < ActiveRecord::Base
     :media_category_id, 
     :name,
     :original_name,
-    :description, 
+    :description,
+    :sort_order,
     :processed,
     :image_content_type,
     :file_content_type

data/app/models/caboose/media_category.rb

@@ -3,7 +3,7 @@ class Caboose::MediaCategory < ActiveRecord::Base
   self.table_name = "media_categories"  
   belongs_to :parent, :class_name => 'Caboose::MediaCategory'
   has_many :children, :class_name => 'Caboose::MediaCategory', :foreign_key => 'parent_id', :order => 'name'
-  has_many :media, :class_name => 'Caboose::Media', :order => 'name'  
+  has_many :media, :class_name => 'Caboose::Media', :order => 'sort_order'  
   attr_accessible :id, :site_id, :parent_id, :name
   
   def self.top_category(site_id)

data/app/models/caboose/schema.rb

@@ -355,6 +355,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :media_category_id , :integer    ],
         [ :name              , :string     ],
         [ :description       , :text       ],
+        [ :sort_order        , :integer    ],
         [ :original_name     , :string     ],
         [ :image             , :attachment ],
         [ :file              , :attachment ],
@@ -709,6 +710,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :facebook_page_id     , :string ],
         [ :twitter_username     , :string ],
         [ :instagram_username   , :string ],
+        [ :instagram_user_id    , :string ],
+        [ :instagram_access_token , :text ],
         [ :youtube_url          , :string ],
         [ :pinterest_url        , :string ],
         [ :vimeo_url            , :string ],

data/app/models/caboose/social_config.rb

@@ -7,6 +7,8 @@ class Caboose::SocialConfig < ActiveRecord::Base
     :facebook_page_id     ,
     :twitter_username     ,
     :instagram_username   ,
+    :instagram_user_id    ,
+    :instagram_access_token,
     :youtube_url          ,
     :pinterest_url        ,
     :vimeo_url            ,

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

@@ -423,7 +423,7 @@
 			  		version: "custom"
 			  	});
 			  <% end %>
-			  		console.dir(resp.items);
+			 // 		console.dir(resp.items);
 			  		window.google_fonts = resp.items;
 						update_fonts(0, 10);
 			  		var first_font = $(".font-li.selected").data("index");

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

@@ -8,7 +8,7 @@
   				'id'         => 'ID #',
           'published'  => 'Published',
   				'title'	     => 'Title',
-  				'body'       => 'Body',
+  		#		'body'       => 'Body',
   				'created_at' => 'Date Created'
   			})
   		%>
@@ -18,7 +18,7 @@
         <td><%= raw p.id %></td>
         <td><%= p.published ? "Yes" : "No" %></td>
         <td><%= raw p.title %></td>
-        <td><%= raw Caboose.teaser_text(p.body, 100) %></td>
+   
         <td><%= p.created_at.strftime("%m/%d/%Y") %></td>    
       </tr>
     <% end %>

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

@@ -57,9 +57,9 @@ $(document).ready(function() {
   new ModelBinder({
     name: 'Role',
     id: <%= @role.id %>,
-    listing_url: 'get /admin/roles',
-    update_url: 'put /admin/roles/<%= @role.id %>',
-    delete_url: 'delete /admin/roles/<%= @role.id %>',
+    listing_url: '/admin/roles',
+    update_url: '/admin/roles/<%= @role.id %>',
+    delete_url: '/admin/roles/<%= @role.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
       { name: 'parent_id'   , nice_name: 'Parent'      , type: 'select', value: <%= @role.parent_id %>, text: "<%= @role.parent.nil? ? '[No parent]' : @role.parent.name %>", show_controls: true, loading_message: 'Getting roles...', options_url: '/admin/roles/options', width: 590, message: 'message' },    

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

@@ -18,7 +18,7 @@
   		%>
     </tr>
   <% @settings.each do |setting| %>
-    <tr onclick="window.location='/admin/settings/<%= setting.id %>/edit';">
+    <tr onclick="window.location='/admin/settings/<%= setting.id %>';">
       <td><%= setting.name  %></td>
       <td><%= setting.value %></td>    
     </tr>

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

@@ -1,12 +1,27 @@
 <%
 sc = @social_config
+ms = Caboose::Site.where(:is_master => true).first
+domain = ms ? (ms.primary_domain ? ms.primary_domain.domain : 'www.caboosecms.com') : 'www.caboosecms.com'
 %>
 <h1>Social Media Config</h1>
 
 <p>Find your Facebook page ID <a href="http://findmyfacebookid.com/" target="_blank">here</a>.</p>
 <p><div id="socialconfig_<%= sc.id %>_facebook_page_id"     ></div></p>
 <p><div id="socialconfig_<%= sc.id %>_twitter_username"     ></div></p>
-<p><div id="socialconfig_<%= sc.id %>_instagram_username"   ></div></p>
+<p><div id="socialconfig_<%= sc.id %>_instagram_username"   ></div>
+<% if sc.instagram_access_token %>
+<p style="margin-top:4px;width:518px;font-size:14px;color:green;text-align:right;">
+Authorized
+<a href="#" id="deauthorize-instagram" style="color:#949494;font-size:12px;margin-left:6px;">Deauthorize</a>
+</p><% end %>
+</p>
+<% if !sc.instagram_access_token %>
+<p style="margin-top:2px;width:518px;font-size:13px;color:#000;text-align:right;"><a href="https://api.instagram.com/oauth/authorize/?client_id=bac12987b6cb4262a004f3ffc388accc&redirect_uri=http://<%= domain %>/api/instagram&response_type=code&state=<%= @site.id %>">Authorize Instagram</a> (you must authorize to show posts on this website)
+<% if params[:instagram] && params[:instagram] == 'fail' %>
+<br /><span style="color:red;">Instagram login failed. Please try again.</span>
+<% end %>
+</p>
+<% end %>
 <p><div id="socialconfig_<%= sc.id %>_youtube_url"          ></div></p>
 <p><div id="socialconfig_<%= sc.id %>_pinterest_url"        ></div></p>
 <p><div id="socialconfig_<%= sc.id %>_vimeo_url"            ></div></p>
@@ -19,11 +34,32 @@ sc = @social_config
       
 <div id='message'></div>
 
+<% content_for :caboose_css do %>
+<style type="text/css">
+  #deauthorize-instagram:hover {
+    color: red !important;
+  }
+</style>
+<% end %>
+
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 
 $(document).ready(function() {
+  $("#deauthorize-instagram").click(function(event) {
+    event.preventDefault();
+    $.ajax({
+      url: "/api/instagram",
+      type: 'delete',
+      data: {
+        site_id: <%= @site.id %>
+      },
+      success: function(data) {
+        document.location.reload(true);
+      }
+    });
+  });
     
   new ModelBinder({
     name: 'SocialConfig',

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

@@ -6,7 +6,7 @@
 <p><input type='password' name='password2'  id='password2'  value="" placeholder='Confirm password' /></p>
 <div id='message'></div>
 <p>
-<input type='button' value='Back' onclick="window.location='/admin/users/<%= @edituser.id %>/edit';" />
+<input type='button' value='Back' onclick="window.location='/admin/users/<%= @edituser.id %>';" />
 <input type='button' value='Update Password' onclick="update_password();" />
 </p>
 

data/config/routes.rb

@@ -246,6 +246,7 @@ Caboose::Engine.routes.draw do
   get     "/admin/media-categories/tree"       => "media_categories#admin_tree"    
   post    "/admin/media-categories"            => "media_categories#admin_add"
   post    "/admin/media-categories/:id/attach" => "media_categories#admin_attach"
+  put     "/admin/media-categories/:id/sort-order" => "media_categories#admin_update_sort_order"    
   put     "/admin/media-categories/:id"        => "media_categories#admin_update"      
   delete  "/admin/media-categories/:id"        => "media_categories#admin_delete"
   
@@ -751,6 +752,8 @@ Caboose::Engine.routes.draw do
   #=============================================================================
   
   get "/api/products"               => "products#api_index"
+  get "/api/instagram"              => "social#authorize_instagram"
+  delete "/api/instagram"              => "social#deauthorize_instagram"
   get "/api/products/:id"           => "products#api_details"
   get "/api/products/:id/variants"  => "products#api_variants"  
   get "caboose/block-types"         => "block_types#api_block_type_list"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.79'
+  VERSION = '0.7.80'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.79
+  version: 0.7.80
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1237,7 +1237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CMS built on rails.