adminpanel 2.4.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1650330680de365d6b011038bc783035919bd79f
-  data.tar.gz: 880a805a5ffac7e6148fdadff69a3cffacb84a4f
+  metadata.gz: 29e7779fdfad1dfcd0ba7a9530ec701475088269
+  data.tar.gz: 7585703c7329d3abff21c22a5ce9695e56fa47d9
 SHA512:
-  metadata.gz: 180259d6586a62b39581914961587ce8f19090a81fa2302c5abde0010c09ab2349aebce132ce227c05a3c5deb168a11bccd83341a80df56c776df744c12b3927
-  data.tar.gz: 8994ef9ade494de2983c6c27eb99a4c83be63e598e2eb2208f457dcde2b5d9de58205826681b27c792ae1af8978215cbe5d092b98e056dc35e8af469370e2c12
+  metadata.gz: 0292a2d3d33a67604098adec66048e06ac3ace8a9b795290b3edfcbab1dca0a5600547103d68126b0b2b15592cc49d5109bddb2c2381116ffa8289172ea64336
+  data.tar.gz: 866ef3c3547ae743a1cccbf5a6123aeac6454210abfe498c876134a12d20db5276ce91ed9e008242f436c9e1ffa26f2e8335170bb006d92fbe8fa29f41952579

data/.travis.yml

@@ -9,3 +9,4 @@ cache: bundler
 
 env:
   - RAILS=4.2.0
+  - RAILS=4.2.1

data/README.md

@@ -3,9 +3,9 @@
 Thank you for considering this gem, we are going to use the lastest Rails version of Rails. make sure you can use it before trying this gem out.
 
 [![Gem Version](https://badge.fury.io/rb/adminpanel.svg)](http://badge.fury.io/rb/adminpanel)
-[![Build Status](https://travis-ci.org/joseramonc/adminpanel.svg?branch=master)](https://travis-ci.org/joseramonc/adminpanel)
-[![Code Climate](https://codeclimate.com/github/joseramonc/adminpanel/badges/gpa.svg)](https://codeclimate.com/github/joseramonc/adminpanel)
-<!-- [![Dependency Status](https://gemnasium.com/joseramonc/adminpanel.svg)](https://gemnasium.com/joseramonc/adminpanel) -->
+[![Build Status](https://travis-ci.org/codn/adminpanel.svg?branch=master)](https://travis-ci.org/codn/adminpanel)
+[![Code Climate](https://codeclimate.com/github/codn/adminpanel/badges/gpa.svg)](https://codeclimate.com/github/codn/adminpanel)
+<!-- [![Dependency Status](https://gemnasium.com/codn/adminpanel.svg)](https://gemnasium.com/codn/adminpanel) -->
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -16,8 +16,6 @@ And then execute:
 
     $ bundle
 
-## Usage
-
 In you application.rb
 
     config.i18n.default_locale = :es # or :en
@@ -28,17 +26,19 @@ Then run:
 
     rails g adminpanel:initialize
     rake db:migrate
-to create the database that the adminpanel it's expecting, this will also seed the database with the default user (email: 'admin@admin.com', password: 'password').
+to create the database that the adminpanel it's expecting, this will also seed the database with the default user if you're in development environment (email: 'admin@admin.com', password: 'password').
+
+Then, mount the gem wherever you like!
 
-Make sure you read the wiki, there is the descriptions of every relevant part of the gem.
+    mount Adminpanel::Engine => '/panel'
 
-To create a new resource check the [Resource Generator.](https://github.com/joseramonc/adminpanel/wiki/Generator-adminpanel:resource)
+## Usage
 
-You can seed the sections with help of the [Section task.](https://github.com/joseramonc/adminpanel/wiki/Rake-task-adminpanel:section)
+Make sure you [read the wiki](https://github.com/codn/adminpanel/wiki), there is the descriptions of every relevant part of the gem.
 
-Then, mount the gem wherever you like!
+To create a new resource check the [Resource Generator.](https://github.com/codn/adminpanel/wiki/Generator-adminpanel:resource)
 
-    mount Adminpanel::Engine => '/panel'
+You can seed the sections with help of the [Section task.](https://github.com/codn/adminpanel/wiki/Rake-task-adminpanel:section)
 
 ## Dependencies
 
@@ -48,10 +48,10 @@ Please make sure that you have ImageMagick -v 2.13.2 installed before trying to
 
 Currently the integrations working are:
 
-* [Google Analytics Service](https://github.com/joseramonc/adminpanel/wiki/include-Google-Analytics)
-* [Facebook Share Link to Wall](https://github.com/joseramonc/adminpanel/wiki/include-Adminpanel::Facebook)
-* [Twitter API](https://github.com/joseramonc/adminpanel/wiki/include-Adminpanel::Twitter)
-* [Instagram API](https://github.com/joseramonc/adminpanel/wiki/include-Adminpanel::Instagram)
+* [Google Analytics Service](https://github.com/codn/adminpanel/wiki/include-Google-Analytics)
+* [Facebook Share Link to Wall](https://github.com/codn/adminpanel/wiki/include-Adminpanel::Facebook)
+* [Twitter API](https://github.com/codn/adminpanel/wiki/include-Adminpanel::Twitter)
+* [Instagram API](https://github.com/codn/adminpanel/wiki/include-Adminpanel::Instagram)
 
 ## Contributing
 
@@ -61,4 +61,4 @@ Currently the integrations working are:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-Any questions, errors or feature suggestions [are welcome in the issues](https://github.com/joseramonc/adminpanel/issues/new)
+Any questions, errors or feature suggestions [are welcome in the issues](https://github.com/codn/adminpanel/issues/new)

data/adminpanel.gemspec

@@ -6,12 +6,12 @@ require 'adminpanel/version'
 Gem::Specification.new do |spec|
   spec.name          = 'adminpanel'
   spec.version       = Adminpanel::VERSION
-  spec.authors       = ['Jose Ramon Camacho', 'Victor Camacho']
+  spec.authors       = ['Jose Ramon Camacho', 'Victor Camacho', 'Eduardo Albertos']
   spec.email         = ['info@codn.mx']
   spec.description   = %q{Gem that focus on making a public site's resources very quickly while being very configurable!,
     supports facebook sharing, twitter, instagram and google analytics integration}
   spec.summary       = %q{Made with <3 by CoDN}
-  spec.homepage      = 'https://github.com/joseramonc/adminpanel'
+  spec.homepage      = 'https://github.com/codn/adminpanel'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -24,32 +24,33 @@ Gem::Specification.new do |spec|
   spec.requirements  << 'imagemagick installed'
 
   spec.add_runtime_dependency 'rails',       '>= 4.2.0', '< 5.0.0'
-  spec.add_runtime_dependency 'mini_magick', '4.0.2'
+  spec.add_runtime_dependency 'mini_magick', '4.1.0'
   spec.add_runtime_dependency 'bcrypt',      '~> 3.1',   '>= 3.1.7'
   spec.add_runtime_dependency 'carrierwave', '~> 0.10',  '>= 0.10.0'
   spec.add_runtime_dependency 'cancancan',   '~> 1.10.1', '>= 1.10.1'
 
   # Implemented APIs
   spec.add_runtime_dependency 'google-api-client', '0.8.2'  # Google analytics
+  spec.add_runtime_dependency 'instagram',         '1.1.3'  # Instagram
   spec.add_runtime_dependency 'koala',             '1.10.1' # Facebook
-  spec.add_runtime_dependency 'twitter',           '5.13.0' # Twitter
   spec.add_runtime_dependency 'omniauth-twitter',  '1.1.0'  # login Twitter
-  spec.add_runtime_dependency 'instagram',         '1.1.3'  # Instagram
+  spec.add_runtime_dependency 'twitter',           '5.14.0' # Twitter
 
   # Asset dependencies
+  spec.add_runtime_dependency 'coffee-rails',       '~> 4.1.0', '>= 4.1.0'
   spec.add_runtime_dependency 'font-awesome-rails', '~> 4.2',   '>= 4.2.0'
+  spec.add_runtime_dependency 'jquery-rails',       '4.0.3'
+  spec.add_runtime_dependency 'jquery-ui-rails',    '5.0.3'
   spec.add_runtime_dependency 'sass-rails',         '~> 5.0.0', '>= 5.0.0'
-  spec.add_runtime_dependency 'coffee-rails',       '~> 4.1.0', '>= 4.1.0'
-  spec.add_runtime_dependency 'jquery-rails',       '3.1.2'
   spec.add_runtime_dependency 'turbolinks',         '~> 2.5.0', '>= 2.5.2'
 
   # Development dependencies
   spec.add_runtime_dependency 'faker', '~> 1.3',   '>= 1.3.0'
 
   # Test dependencies
-  spec.add_development_dependency 'sqlite3',          '~> 1.3',   '1.3.10'
   spec.add_development_dependency 'minitest',         '>= 5.4.0', '<= 6.0.0'
   spec.add_development_dependency 'minitest-emoji',   '2.0.0'
   spec.add_development_dependency 'minitest-capybara','~> 0.7',   '>= 0.7.1'
   spec.add_development_dependency 'poltergeist',      '~> 1.5',   '>= 1.5.1'
+  spec.add_development_dependency 'sqlite3',          '~> 1.3',   '1.3.10'
 end

data/app/assets/javascripts/adminpanel/application.js

@@ -12,6 +12,10 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require jquery-ui/core
+//= require jquery-ui/widget
+//= require jquery-ui/mouse
+//= require jquery-ui/sortable
 //= require turbolinks
 //= require adminpanel/bootstrap
 //= require_tree .

data/app/assets/javascripts/adminpanel/bootstrap-wysihtml5.js

@@ -37,8 +37,6 @@
               "<div class='btn-group'>" +
                 "<a class='btn" + size + "' data-wysihtml5-command='insertUnorderedList' title='" + locale.lists.unordered + "' tabindex='-1'><i class='fa fa-list-ul'></i></a>" +
                 "<a class='btn" + size + "' data-wysihtml5-command='insertOrderedList' title='" + locale.lists.ordered + "' tabindex='-1'><i class='fa fa-list-ol'></i></a>" +
-                "<a class='btn" + size + "' data-wysihtml5-command='Outdent' title='" + locale.lists.outdent + "' tabindex='-1'><i class='fa fa-outdent'></i></a>" +
-                "<a class='btn" + size + "' data-wysihtml5-command='Indent' title='" + locale.lists.indent + "' tabindex='-1'><i class='fa fa-indent'></i></a>" +
               "</div>" +
             "</li>";
         },
@@ -88,7 +86,7 @@
             var size = (options && options.size) ? ' btn-'+options.size : '';
             return "<li>" +
               "<div class='btn-group'>" +
-                "<a class='btn" + size + "' data-wysihtml5-action='change_view' title='" + locale.html.edit + "' tabindex='-1'><i class='fa fa-pencil'></i></a>" +
+                "<a class='btn" + size + "' data-wysihtml5-action='change_view' title='" + locale.html.edit + "' tabindex='-1'><i class='fa fa-code'></i></a>" +
               "</div>" +
             "</li>";
         },
@@ -389,7 +387,7 @@
         "color": false,
         "emphasis": true,
         "lists": true,
-        "html": false,
+        "html": true,
         "link": true,
         "image": true,
         events: {},

data/app/assets/javascripts/adminpanel/sortable.js.coffee

@@ -0,0 +1,27 @@
+ready = ->
+  $('tbody#sortable').sortable
+    update: (event, ui) ->
+      position = 1
+      $(@).children('tr').each ->
+        if $(@).data('id') == ui.item.data('id')
+          $row = $(@)
+          $.ajax(
+            url: $row.data('url')
+            data:
+              position: position
+            method: 'put',
+            success: ->
+              # flash the updated $row
+              $row.addClass('success')
+              setTimeout ( ->
+                $row.removeClass('success')
+              ), 500
+          )
+          return true
+        else
+          position++
+  $('tbody#sortable').disableSelection
+
+
+$(document).ready(ready)
+$(document).on('page:load', ready)

data/app/assets/stylesheets/adminpanel/application.css

@@ -9,6 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_tree .
+ *= require jquery-ui/draggable
  *= require font-awesome
  *= require_self
  */

data/app/assets/stylesheets/adminpanel/sortable.css.scss.erb

@@ -0,0 +1,13 @@
+td.draggable-header {
+  width: 10%;
+}
+
+td.draggable {
+  cursor: move;
+  padding-left: 1.5%;
+}
+
+.draggable.img {
+  padding-left: 2.2%;
+  padding-top: 7.5%;
+}

data/app/controllers/adminpanel/application_controller.rb

@@ -10,7 +10,6 @@ module Adminpanel
     include SessionsHelper
     include Adminpanel::RestActions
     include Adminpanel::SortableActions
-    include Adminpanel::GalleryzableActions
     include Adminpanel::FacebookActions
     include Adminpanel::TwitterActions
     include Adminpanel::SitemapActions

data/app/controllers/adminpanel/sessions_controller.rb

@@ -4,7 +4,10 @@ module Adminpanel
     include ApplicationHelper
 
     layout 'adminpanel/application-login'
-    before_action :configure_instagram, only:[:instagram_login, :instagram_callback]
+    before_action :configure_instagram, only: [
+                                          :instagram_login,
+                                          :instagram_callback
+                                        ]
 
     def new
     end
@@ -43,7 +46,7 @@ module Adminpanel
     end
 
     def instagram_callback
-      response = Instagram.get_access_token(params[:code], :redirect_uri => instagram_callback_sessions_url)
+      response = Instagram.get_access_token(params[:code], redirect_uri: instagram_callback_sessions_url)
       username = Instagram.client(access_token: response.access_token).user.username
       Auth.create(key: 'instagram', value: response.access_token, name: "@#{username}")
       redirect_to instagram_analytics_path

data/app/controllers/concerns/adminpanel/rest_actions.rb

@@ -2,28 +2,26 @@ module Adminpanel
   module RestActions
     extend ActiveSupport::Concern
     included do
-      before_action :set_resource_instance,         only: [
-                                                          :show,
-                                                          :edit,
-                                                          :update,
-                                                          :destroy,
-                                                          :fb_choose_page,
-                                                          :fb_save_token,
-                                                          :fb_publish,
-                                                          :twitter_publish,
-                                                          :move_to_better,
-                                                          :move_to_worst
-                                                    ]
-      before_action :set_resource_collection,       only: [:index, :destroy]
-      before_action :set_relationship_collections,  only: [:new, :create, :edit, :update]
+      before_action :set_resource_instance, only: [
+                                              :show,
+                                              :edit,
+                                              :update,
+                                              :destroy,
+                                              :fb_choose_page,
+                                              :fb_save_token,
+                                              :fb_publish,
+                                              :twitter_publish
+                                            ]
+      before_action :set_resource_collection,      only: [:index, :destroy]
+      before_action :set_relationship_collections, only: [:new, :create, :edit, :update]
     end
 
     def index
-      render 'adminpanel/templates/index'
+      render 'adminpanel/templates/index' if stale?(etag: @collection, public: true, template: false)
     end
 
     def show
-      render 'adminpanel/templates/show' if stale?(@resource_instance, public: true)
+      render 'adminpanel/templates/show' if stale?(etag: @resource_instance, public: true, template: false)
     end
 
     def new
@@ -42,8 +40,10 @@ module Adminpanel
           format.js do
             # if format js, request is from another controller's form
             if params[:belongs_request]
+              # we are in other controller as a belongs_to, add option to select
               render 'adminpanel/templates/create_belongs_to', locals: { resource: @resource_instance }
             else
+              # we are in other controller as a has_many, add checkbox
               render 'adminpanel/templates/create_has_many', locals: { resource: @resource_instance }
             end
           end
@@ -79,12 +79,15 @@ module Adminpanel
       set_has_many_collections
     end
 
+    # set the collection of objects for each attribute that it's a select (belongs_to)
+    # to populate the <select></select>s
     def set_belongs_to_collections
       @model.relationships_of('belongs_to').each do |class_variable|
         set_relationship(class_variable)
       end
     end
 
+    # set the collection of objects for each attribute that it's a checkbox (has_many)
     def set_has_many_collections
       @model.relationships_of('has_many').each do |class_variable|
         set_relationship(class_variable)
@@ -92,7 +95,7 @@ module Adminpanel
     end
 
     def set_relationship(class_variable)
-      if class_variable.respond_to?("of_model")
+      if class_variable.respond_to?('of_model')
         @collections.merge!({"#{class_variable}" => class_variable.of_model(@model.display_name)})
       else
         @collections.merge!({"#{class_variable}" => class_variable.all})
@@ -100,10 +103,9 @@ module Adminpanel
     end
 
     def merge_params
-      params.merge({model:             params[:model]})             if params[:model].present?
-      params.merge({model_name:        params[:model_name]})        if params[:model_name].present?
-      params.merge({belongs_request:   params[:belongs_request]})   if params[:belongs_request].present?
-      params.merge({currentcontroller: params[:currentcontroller]}) if params[:currentcontroller].present?
+      params.merge({model:           params[:model]})           if params[:model].present?
+      params.merge({model_name:      params[:model_name]})      if params[:model_name].present?
+      params.merge({belongs_request: params[:belongs_request]}) if params[:belongs_request].present?
     end
 
     def whitelisted_params
@@ -119,7 +121,7 @@ module Adminpanel
       @collection = @model.all
     end
 
-    def render_new format
+    def render_new(format)
       format.html do
         render 'adminpanel/templates/new'
       end

data/app/controllers/concerns/adminpanel/sortable_actions.rb

@@ -2,28 +2,11 @@ module Adminpanel
   module SortableActions
     extend ActiveSupport::Concern
 
-    def move_to_better
+    def move_to_position
       resource = @model.find(params[:id])
-      resource.move_to_better_position
-      update_index_table
 
-    end
-
-    def move_to_worst
-      resource = @model.find(params[:id])
-      resource.move_to_worst_position
-      update_index_table
-    end
-
-  protected
-    def update_index_table
-      respond_to do |format|
-        format.js do
-          render 'adminpanel/templates/index_records', locals: {
-            collection: @model.all
-          }
-        end
-      end
+      resource.move_to_position(params[:position].to_i)
+      render json: {status: :ok}
     end
   end
 end

data/app/helpers/adminpanel/breadcrumbs_helper.rb

@@ -2,17 +2,18 @@ module Adminpanel
   module BreadcrumbsHelper
 
     def breadcrumb_add(title, url)
-      initialize_breadcrumb << { title: title, url: url }
+      breadcrumb << { title: title, url: url }
     end
 
     def render_breadcrumb(divider)
-      render partial: 'adminpanel/shared/breadcrumb', locals: { nav: initialize_breadcrumb, divider: divider }
+      render 'adminpanel/shared/breadcrumb', nav: breadcrumb, divider: divider
     end
 
     private
-    def initialize_breadcrumb
-      @breadcrumb ||= [{ title: I18n.t('breadcrumb.index'), url: adminpanel.root_url }, ]
-    end
+
+      def breadcrumb
+        @breadcrumb ||= [{ title: I18n.t('breadcrumb.index'), url: adminpanel.root_url }]
+      end
 
   end
 end

data/app/helpers/adminpanel/router_helper.rb

@@ -1,7 +1,11 @@
 module Adminpanel
   module RouterHelper
-    def get_gallery_children(resource)
-      resource_class(resource).gallery_children
+    def gallery_is_sortable?(resource)
+      resource_class(resource).has_sortable_gallery?
+    end
+
+    def sortable_gallery(resource)
+      resource_class(resource).gallery_relationship
     end
 
     def resources_parameters(resource)
@@ -16,7 +20,7 @@ module Adminpanel
       resource_class(resource).twitter_share?
     end
 
-    def is_sortable?(resource)
+    def resource_is_sortable?(resource)
       resource_class(resource).is_sortable?
     end
 
@@ -37,7 +41,9 @@ module Adminpanel
         }
       }
     end
+
     private
+
       def resource_class(resource)
         "adminpanel/#{resource.to_s.singularize}".classify.constantize
       end