keppler 2.0.2 → 2.0.3

data/installer/core/app/policies/application_policy.rb

@@ -6,11 +6,11 @@ class ApplicationPolicy
     user.keppler_admin?
   end
 
-  def admin?
-    user.admin?
-  end
-
   def same_user?(id)
     user.id.eql?(id)
   end
+
+  def user_can?(objects, method)
+    user.can?(objects.model_name.name, method)
+  end
 end

data/installer/core/app/policies/controller_policy.rb

@@ -8,31 +8,31 @@ class ControllerPolicy < ApplicationPolicy
   end
 
   def index?
-    true
+    keppler_admin? || user_can?(@objects, 'index')
   end
 
   def new?
-    create?
+    create? || user_can?(@objects, 'create')
   end
 
   def create?
-    keppler_admin? || admin?
+    keppler_admin? || user_can?(@objects, 'create')
   end
 
   def edit?
-    update?
+    update? || user_can?(@objects, 'update')
   end
 
   def update?
-    keppler_admin? || admin?
+    keppler_admin? || user_can?(@objects, 'update')
   end
 
   def clone?
-    keppler_admin? || admin?
+    keppler_admin? || user_can?(@objects, 'clone')
   end
 
   def show?
-    true
+    keppler_admin? || user_can?(@objects, 'index')
   end
 
   def destroy_multiple?
@@ -40,14 +40,18 @@ class ControllerPolicy < ApplicationPolicy
   end
 
   def destroy?
-    keppler_admin? || admin?
+    keppler_admin? || user_can?(@objects, 'destroy')
   end
 
-  def import?
-    keppler_admin? || admin?
+  def upload?
+    keppler_admin? || user_can?(@objects, 'upload')
   end
 
   def download?
-    keppler_admin? || admin?
+    keppler_admin? || user_can?(@objects, 'download')
+  end
+
+  def sort?
+    keppler_admin? || user_can?(@objects, 'sort')
   end
 end

data/installer/core/app/policies/role_policy.rb

@@ -0,0 +1,25 @@
+# Policy for Role model
+class RolePolicy < ControllerPolicy
+  attr_reader :user, :objects
+
+  def initialize(user, objects)
+    @user = user
+    @objects = objects
+  end
+
+  def clone?
+    false
+  end
+
+  def add_permissions?
+    keppler_admin? || user_can?(@objects, 'add_permissions')
+  end
+
+  def create_permissions?
+    keppler_admin? || user_can?(@objects, 'create_permissions')
+  end
+
+  def show_description?
+    keppler_admin? || user_can?(@objects, 'create_permissions')
+  end
+end

data/installer/core/app/policies/user_policy.rb

@@ -12,6 +12,6 @@ class UserPolicy < ControllerPolicy
   end
 
   def destroy?
-    (keppler_admin? || admin?) && !same_user?(@user)
+    keppler_admin? && !same_user?(@user)
   end
 end

data/installer/core/app/uploaders/attachment_uploader.rb

@@ -3,12 +3,16 @@
 # AttachmentUploader Carrierwave
 class AttachmentUploader < CarrierWave::Uploader::Base
   # Include RMagick or MiniMagick support:
-  # include CarrierWave::RMagick
+  include CarrierWave::RMagick
+  include CarrierWave::ImageOptimizer
+
   # include CarrierWave::MiniMagick
 
   # Choose what kind of storage to use for this uploader:
   storage :file
   # storage :fog
+  process :optimize
+  process quality: 100
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
@@ -16,6 +20,13 @@ class AttachmentUploader < CarrierWave::Uploader::Base
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
+  def size_range
+    return_size_type(file.content_type)
+  end
+
+  version :thumb do
+    process resize_to_fit: [200, 200]
+  end
   # Provide a default URL as a default if there hasn't been a file uploaded:
 
   # Process files as they are uploaded:
@@ -41,4 +52,10 @@ class AttachmentUploader < CarrierWave::Uploader::Base
   # def filename
   #   "something.jpg" if original_filename
   # end
+  private
+
+  def return_size_type(file)
+    return 0..1.megabytes if file.include?('image')
+    0..5.megabytes
+  end
 end

data/installer/core/app/views/admin/customizes/_description.html.haml

@@ -1,13 +1,13 @@
 %aside.control-sidebar.control-sidebar-light
   .tab-content
     %p.control-sidebar-heading
-      = @activities.empty? ? t('keppler.messages.no_events') : t("keppler.titles.history")
+      = @activities.empty? ? t('keppler.messages.no_events') : t('keppler.titles.history')
     %ul.timeline
       - @activities.each do |activity|
-        - if activity.trackable_type.eql? "Session"
+        - if activity.trackable_type.eql? 'Session'
           %li
-            = render partial: "public_activity/session/#{activity.key.split(".").second}", locals: { activity: activity, method: "name" }
+            = render partial: "public_activity/session/#{activity.key.split('.').second}", locals: { activity: activity, method: 'name' }
         - else
           %li
-            = render partial: "public_activity/layout/#{activity.key.split(".").second}", locals: { activity: activity, method: "name" }
+            = render partial: "public_activity/layout/#{activity.key.split('.').second}", locals: { activity: activity, method: 'name' }
 .control-sidebar-bg

data/installer/core/app/views/admin/customizes/_form.html.haml

@@ -2,7 +2,7 @@
   .container
     .row
       .col-lg-2
-        = link_to admin_customizes_path, class: "", "data-position" => "bottom", "data-tooltip" => t("keppler.actions.back") do
+        = link_to admin_customizes_path, 'data-position' => 'bottom', 'data-tooltip' => t('keppler.actions.back') do
           .arrow-back.btn.btn-default
             %i.fa.fa-angle-left
             = t('keppler.actions.back')
@@ -23,11 +23,11 @@
                         .row
                           .col-md-12
                             .form-group.files
-                              %input{type: "hidden", name: "customize[file]"}
+                              %input{ type: 'hidden', name: 'customize[file]' }
                               = f.input :file, label: false
 
                   .row
                     .col-lg-12
                       .pull-right
-                        = f.button :submit, t("keppler.actions.save"), name: "_save", class: "btn-primary"
-                        = f.button :submit, t("keppler.actions.save_and_add_another"), name: "_add_other"
+                        = f.button :submit, t('keppler.actions.save'), name: '_save', class: 'btn-primary'
+                        = f.button :submit, t('keppler.actions.save_and_add_another'), name: '_add_other'

data/installer/core/app/views/admin/customizes/_listing.html.haml

@@ -1,6 +1,6 @@
 %tr{id: "row-#{customize.id}"}
   %td.item-check{style:"width: 5%"}
-    - if Pundit.policy(current_user, Customize).destroy?
+    - if can?(Customize).destroy?
       - if !customize.id.eql?(1) && !customize.installed
         = link_to admin_customize_path(customize), method: :delete do
           %i.icon-trash.icon-delete

data/installer/core/app/views/admin/customizes/_switch_default_template.html.haml

@@ -1,16 +1,11 @@
 = simple_form_for customize, url: admin_customize_install_default_path(customize), method: :post do |f|
   - if customize.installed == false
-    %label
-      %span.status.pull-left{style: "padding-right: 50px"} No installed
-      .switch.pull-right
-        %input{name: "customize[installed]", type: "hidden", value: "true"}
-        %input#default_switch{:name => "customize[installed]", type: "checkbox", value: "true"}/
-        %label.label-default{:for => "default_switch", onclick: "$('#edit_customize_#{customize.id}').submit(); $('#spinner').css('display', 'block')"}
-
+    %label.switch.pull-right
+      %input{ name: 'customize[installed]', type: 'hidden', value: 'true' }
+      %input#default_switch{ name: 'customize[installed]', type: 'checkbox', value: 'true'}
+      %span.slider.round{onclick: "$('#edit_customize_#{customize.id}').submit(); $('#spinner').css('display', 'block')"}
   - else
-    %label
-      %span.status.pull-left{style: "padding-right: 50px"} Installed
-      .switch.pull-right
-        %input{name: "customize[installed]", type: "hidden", value: "false"}
-        %input#default_switch{:name => "customize[installed]", type: "checkbox", value: "false", checked: "checked"}/
-        %label.label-default{:for => "default_switch", onclick: "$('#edit_customize_#{customize.id}').submit(); $('#spinner').css('display', 'block')"}
+    %label.switch.pull-right
+      %input{ name: 'customize[installed]', type: 'hidden', value: 'false' }
+      %input.active#default_switch{ name: 'customize[installed]', type: 'checkbox', value: 'false', checked: "checked"}
+      %span.slider.round{onclick: "$('#edit_customize_#{customize.id}').submit(); $('#spinner').css('display', 'block')"}

data/installer/core/app/views/admin/customizes/_switch_template.html.haml

@@ -2,18 +2,15 @@
   = simple_form_for [:admin, customize] do |f|
     %label
       - if customize.installed == false
-        %span.status.pull-left{style: "padding-right: 50px"} No installed
-        .switch.pull-right
-          %input{name: "customize[installed]", type: "hidden", value: "true"}
-          %input#default_switch{:name => "customize[installed]", type: "checkbox", value: "true"}/
-          %label.label-default{:for => "default_switch", onclick: "installTemplate(#{customize.id})"}
-
+        %label.switch.pull-right
+          %input{ name: 'customize[installed]', type: 'hidden', value: 'true' }
+          %input#default_switch{ name: 'customize[installed]', type: 'checkbox', value: 'true'}
+          %span.slider.round{onclick: "installTemplate(#{customize.id})"}
       - else
-        %span.status.pull-left{style: "padding-right: 50px"} Installed
-        .switch.pull-right
-          %input{name: "customize[installed]", type: "hidden", value: "false"}
-          %input#default_switch{:name => "customize[installed]", type: "checkbox", value: "false", checked: "checked"}/
-          %label.label-default{:for => "default_switch", onclick: "installTemplate(#{customize.id})"}
+        %label.switch.pull-right
+          %input{ name: 'customize[installed]', type: 'hidden', value: 'false' }
+          %input.active#default_switch{ name: 'customize[installed]', type: 'checkbox', value: 'false', checked: 'checked' }
+          %span.slider.round{onclick: "installTemplate(#{customize.id})"}
 
 :javascript
   function installTemplate(customize_id) {

data/installer/core/app/views/admin/customizes/index.html.haml

@@ -1,4 +1,4 @@
-.row{style: 'padding: 2rem;padding-top: 20px;padding: 2rem;'}
+#customize-index.row
   .col-md-6.col-lg-6
     .box.slice-box
       .box-header.with-border
@@ -9,11 +9,11 @@
           %i.icon-screen-desktop#lg
           -# %span.separator-line
           %i.icon-reload#reload
-          = link_to root_path, target: "_blank" do
+          = link_to root_path, target: '_blank' do
             %i.icon-size-fullscreen
 
-      .box-body.box-body-no-padding.hidden-xs#box-body{style:"height: 325px;flow:hidden;overflow:hidden; margin: 0 auto"}
-        %iframe{src: "#{root_path}", frameborder:"0", style:"height:250%;width:250%;zoom:1.8;transform:scale(0.4);transform-origin:0 0;"}
+      .box-body.box-body-no-padding.hidden-xs#box-body
+        %iframe{ src: root_path, frameborder: '0' }
   .col-md-6.col-lg-6
     .box.slice-box
       .box-header.with-border
@@ -25,14 +25,14 @@
               = render 'listing', customize: customize
             - if @objects.size.zero?
               %tr
-                %td{colspan: "4"}
+                %td{ colspan: 4 }
                   %center
-                    = t('keppler.messages.not_found_records', model:  t("keppler.models.pluralize.customizes"))
+                    = t('keppler.messages.not_found_records', model:  t('keppler.models.pluralize.customizes'))
         %center#paginator-module
           = paginate @objects, window: 1
   .listing-show.col.l3.m12.hide-on-small-and-down.hide-on-med-and-down
-    = render "description"
-    - if Pundit.policy(current_user, Customize).create?
+    = render 'description'
+    - if can?(Customize).create?
       .mixed-btn
-        = link_to new_admin_customize_path, class: "btn-float" do
+        = link_to new_admin_customize_path, class: 'btn-float' do
           +

data/installer/core/app/views/admin/layouts/_head.html.haml

@@ -1,8 +1,8 @@
 %head
-  %meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0"}
-  %link{href:'https://fonts.googleapis.com/css?family=Patua+One', rel:'stylesheet', type:'text/css'}
+  %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0' }
+  %link{ href:'https://fonts.googleapis.com/css?family=Patua+One', rel: 'stylesheet', type: 'text/css' }
   %title= content_for?(:title) ? yield(:title) : 'Keppler Admin'
   = stylesheet_link_tag 'admin/application', media: 'all'
   = javascript_include_tag 'admin/application', 'data-turbolinks-track' => true
   = csrf_meta_tags
-  = favicon_link_tag "admin/favicon.png"
+  = favicon_link_tag 'admin/favicon.png'

data/installer/core/app/views/admin/layouts/_keppler_boolean_script.haml

@@ -0,0 +1,12 @@
+:javascript
+  $('.keppler-switch').click(function(event) {
+    event.preventDefault()
+    var input = $(this).find('input')
+    var label = $(this).find('.inline-label')
+    input
+      .toggleClass('active')
+      .val(input.hasClass('active'))
+    label
+      .toggleClass('active')
+      .text(label.hasClass('active'))
+  })

data/installer/core/app/views/admin/layouts/_navigation.html.haml

@@ -1,11 +1,11 @@
 %header.main-header
-  %nav.navbar.navbar-static-top    
-    %a.logo.hidden-xs{href: "/admin/dashboard"}
+  %nav.navbar.navbar-static-top
+    %a.logo.keppler-color.hidden-xs{ href: '/admin/dashboard' }
       %span.logo-mini
         %span K
       %span.logo-lg
         %span K
-    %a.sidebar-toggle{"data-toggle" => "offcanvas", href: "#", role: "button"}
+    %a.sidebar-toggle{ 'data-toggle' => 'offcanvas', href: '#', role: 'button' }
       %i.icon-menu
       %span.sr-only Toggle navigation
     - if listing? && @q
@@ -14,33 +14,34 @@
           = search_form_for [:admin, @q], html: { method: :get } do |f|
             = f.search_field search_model, placeholder: "#{t('keppler.actions.search')}...", class: 'form-control search-bar'
           %span.input-group-btn
-            %button.btn.search-button.toggle-search{type: "submit"}
-              %span.glyphicon.glyphicon-search.search-icon
+            %button.btn.search-button.toggle-search{ type: 'submit' }
+              %i.icon-magnifier.search-icon{ style: 'line-height: 1.4;' }
       .hide-search
-        %i.fa.fa-angle-left
+        %i.fa.fa-arrow-left
 
     .navbar-custom-menu
       %ul.nav.navbar-nav
-        %li.dropdown.messages-menu
-          %a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
-            %i.icon-envelope
+        -# - if defined?(KepplerContactUs) && KepplerContactUs.is_a?(Class)
+          %li.dropdown.messages-menu
+            %a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
+              %i.icon-envelope
         %li.dropdown.user.user-menu
-          %a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
-            .small-profile-img{ style: "background-image: url(#{current_user.avatar? ? current_user.avatar : 'https://thumbs.dreamstime.com/t/profile-icon-male-avatar-portrait-casual-person-silhouette-face-flat-design-vector-46846326.jpg'})" }
+          %a.dropdown-toggle{ 'data-toggle' => 'dropdown', href: '#' }
+            = image_tag (current_user.avatar.url || 'admin/avatar_keppler.svg'), class: 'small-profile-img keppler-background'
             %span.hidden-xs= current_user.name
           %ul.dropdown-menu
             %li.user-header{ style: @appearance.image_background? ? "background-image: url(#{@appearance.image_background})" : nil  }
-              .img-circle.nav-profile-img{:alt => "User Image", style: "background-image: url(#{current_user.avatar? ? current_user.avatar : 'https://thumbs.dreamstime.com/t/profile-icon-male-avatar-portrait-casual-person-silhouette-face-flat-design-vector-46846326.jpg'})"}
+              = image_tag (current_user.avatar.url || 'admin/avatar_keppler.svg'), class: 'img-circle nav-profile-img', alt: current_user.name
               %p
                 = current_user.name
                 %small
-                  = "#{t('keppler.navigation.last_session')} #{current_user.updated_at.strftime("%d %b %Y")}"
+                  = "#{t('keppler.navigation.last_session')} #{current_user.updated_at.strftime('%d %b %Y')}"
             %li.user-footer
               .pull-left
-                = link_to "Profile", "/admin/users/#{current_user.id}", class: "btn btn-default btn-flat"
+                = link_to 'Profile', "/admin/users/#{current_user.id}", class: 'btn btn-default btn-flat'
               .pull-right
-                = link_to t('devise.sign_out'), destroy_session_path(current_user), class: " btn btn-default btn-flat"
+                = link_to t('devise.sign_out'), destroy_session_path(current_user), class: 'btn btn-default btn-flat'
         - if listing?
           %li.hidden-xs
-            %a{:href=>"#", "data-toggle" => "control-sidebar"}
+            %a{ href: '#', 'data-toggle' => 'control-sidebar' }
               %i.icon-clock

data/installer/core/app/views/admin/layouts/_sidebar.html.haml

@@ -1,59 +1,50 @@
 %aside.main-sidebar
-  %section.sidebar.sidebar-collapse{style: "" }
+  %section.sidebar.sidebar-collapse
     / Sidebar user panel
-    .user-panel{ style: @appearance.image_background? ? "background-image: url(#{@appearance.image_background})" : nil  }
+    .user-panel
+      -# Activar background del panel de usuario para versiones darken
+      -# - if @appearance.image_background?
+        :sass
+          .user-panel
+            background-image: url(#{@appearance.image_background})
       .pull-left.image
-        .img-circle.side-img-profile{:alt => "User Image", style: "background-image: url(#{current_user.avatar? ? current_user.avatar : 'https://thumbs.dreamstime.com/t/profile-icon-male-avatar-portrait-casual-person-silhouette-face-flat-design-vector-46846326.jpg'})" }
+        = image_tag (current_user.avatar.url || 'admin/avatar_keppler.svg'), class: 'img-circle side-img-profile keppler-background', alt: current_user.name
       .info
         %p= current_user.name
         %small= current_user.rol.humanize
     / sidebar menu: : style can be found in sidebar.less
     %ul.sidebar-menu.tree{"data-widget" => "tree" }
-      %li.header MAIN NAVIGATION
-      -# %li
+      -# %li.header MAIN NAVIGATION
+      %li
+        -# - if can?('Dashboard').index?
         = link_to '/admin/dashboard' do
           %i.icon-pie-chart
           %span= t('keppler.sidebar-menu.dashboard')
       - @sidebar.each do |menu|
         - menu.each do |key, value|
           - unless menu[key]["submenu"] # ontetab sidebar linkbyg
-            - if menu[key]["model"] && Pundit.policy(current_user, menu[key]["model"].constantize).index?
+            - if menu[key]["model"] && can?(menu[key]["model"].constantize).index?
               %li.treeview{ class: ('active' if controller_name.eql?(menu[key]['name']))}
                 = link_to menu[key]['url_path'], class: "collapsible-header #{'current' if menu[key]['current'].include?(controller_path)}", :'data-no-turbolink'=> true do
                   %i{ class: "icon-#{menu[key]["icon"]}" }
                   %span= t("keppler.sidebar-menu.#{menu[key]['name'].parameterize}")
           - else # tree sidebar links
-            - if menu[key]["model"] && Pundit.policy(current_user, menu[key]["model"].constantize).index?
-              %li{ class: ('active' if menu[key]['current'].include?(controller_path))}
-                %a{ href: "#", class: "#{'active current' if menu[key]['current'].include?(controller_path)}" }
-                  %i{ class: "icon-#{menu[key]['icon']}" }
-                  %span= t("keppler.sidebar-menu.#{menu[key]['name'].parameterize}")
+            - unless menu[key]["model"].eql?('Customize') and Rails.env.production?
+              - if menu[key]["model"] && can?(menu[key]["model"].constantize).index?
+                %li{ class: ('active' if menu[key]['current'].include?(controller_path))}
+                  %a{ href: "#", class: "#{'active current' if menu[key]['current'].include?(controller_path)}" }
+                    %i{ class: "icon-#{menu[key]['icon']}" }
+                    %span= t("keppler.sidebar-menu.#{menu[key]['name'].parameterize}")
+                  %ul.treeview-menu
+                    - menu[key]["submenu"].each do |submenu|
+                      - submenu.each do |name, val|
+                        %li
+                          - if settings_path?
+                            = link_to t("keppler.sidebar-menu.#{menu[key]['name'].parameterize}-submenu.#{submenu[name]['name'].parameterize}"), submenu[name]['url_path'], class: "#{'current' if submenu[name]['current'].include?(@render)}", :'data-no-turbolink'=>true, class: (submenu[name]['url_path'].eql?("/admin/settings/email_setting") ? 'cut-text' : '')
+                          - else
+                            = link_to t("keppler.sidebar-menu.#{menu[key]['name'].parameterize}-submenu.#{submenu[name]['name'].parameterize}"), submenu[name]['url_path'], class: "#{'current' if submenu[name]['current'].include?(controller_path)}", :'data-no-turbolink'=> true, class: (submenu[name]['url_path'].eql?("/admin/settings/email_setting") ? 'cut-text' : '')
+
 
-                %ul.treeview-menu
-                  - menu[key]["submenu"].each do |submenu|
-                    - submenu.each do |name, val|
-                      %li
-                        - if settings_path?
-                          = link_to t("keppler.sidebar-menu.#{menu[key]['name'].parameterize}-submenu.#{submenu[name]['name'].parameterize}"), submenu[name]['url_path'], class: "#{'current' if submenu[name]['current'].include?(@render)}", :'data-no-turbolink'=>true, class: (submenu[name]['url_path'].eql?("/admin/settings/email_setting") ? 'cut-text' : '')
-                        - else
-                          = link_to t("keppler.sidebar-menu.#{menu[key]['name'].parameterize}-submenu.#{submenu[name]['name'].parameterize}"), submenu[name]['url_path'], class: "#{'current' if submenu[name]['current'].include?(controller_path)}", :'data-no-turbolink'=> true, class: (submenu[name]['url_path'].eql?("/admin/settings/email_setting") ? 'cut-text' : '')
-      %li
-        = link_to '#' do
-          %i.icon-settings
-          %span= t('keppler.sidebar-menu.setting')
-          %ul{class: "treeview-menu", style:"display: none;"}
-            %li
-              %a{"data-no-turbolink"=>"true", href:"/admin/settings/basic_information"}
-                = t('keppler.sidebar-menu.setting-submenu.basic-information')
-            %li
-              %a{"data-no-turbolink"=>"true", href:"/admin/settings/email_setting"}
-                = t('keppler.sidebar-menu.setting-submenu.email-setting-smtp')
-            %li
-              %a{"data-no-turbolink"=>"true", href:"/admin/settings/google_analytics_setting"}
-                = t('keppler.sidebar-menu.setting-submenu.google-analytics')
-            %li
-              %a{"data-no-turbolink"=>"true", href:"/admin/settings/social_accounts"}
-                = t('keppler.sidebar-menu.setting-submenu.social-accounts')
   #sidebar-footer
     %a{:href=>"http://slicegroup.xyz", target: "_blank" }
       #slice.brand.pull-left