mokio 0.0.15 → 2.0.8

data/app/helpers/mokio/backend/backend_helper.rb

@@ -112,7 +112,7 @@ module Mokio
           (can? :create, Mokio::ExternalScript)
         )
       end
-      
+
       #return table name for type
       def generate_tableize_name(type)
         type.gsub!("Mokio::","")
@@ -120,6 +120,32 @@ module Mokio
         type.tableize
       end
 
+      def set_sorting_param(obj_class)
+        if obj_class.respond_to? :default_datatable_sorting
+          obj_class.default_datatable_sorting
+        else
+          [[0, 'asc']]
+        end
+      end
+
+      # COMMON INPUTS HELPERS
+
+      def render_backend_input_lang_id(f)
+        f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id'),wrapper: :select2
+      end
+
+      def render_backend_input_active(f)
+        render_backend_input_active_checkbox(f,'active')
+      end
+
+      def render_backend_input_home_page(f)
+        render_backend_input_active_checkbox(f,'home_page')
+      end
+
+      def render_backend_input_active_checkbox(f,name)
+        f.input name.to_sym,:wrapper => :active_checkbox, disabled: !obj.display_editable_field?("#{name}")
+      end
+
     end
   end
 end

data/app/helpers/mokio/backend/common_helper.rb

@@ -13,7 +13,7 @@ module Mokio
       def data_file_model(obj)
         obj.respond_to?("data_file_type") ? obj.data_file_type.to_s.demodulize.tableize : "data_files"
       end
-     
+
       def responsive_dynamic_table(&block)
         content_tag :table, :data => {:source => datatable_source_url}, :class => "responsive dynamicTable display table table-bordered", :border => 0, :cellpadding => 0, :cellspacing => 0, :width => "100%", :id =>"dTable" do
           capture(&block)
@@ -40,7 +40,7 @@ module Mokio
           content_tag :h4 do
             if name
               tag :span
-              concat(name) 
+              concat(name)
             end
             capture(&block) unless name
           end
@@ -66,7 +66,7 @@ module Mokio
       def table_controls_copy_btn(link)
         content_tag :a, :class => "tip", :href => link, "data-hasqtip" => true, "aria-describedby" => "qtip-2", :title => bt("copy") do
           tag :span, :class => "icon12 icomoon-icon-copy-2"
-        end 
+        end
       end
 
       #
@@ -106,7 +106,12 @@ module Mokio
         content_tag :div, :class => "activebutton" do
           tag :input, :type => "checkbox", :checked => ("checked" if arg)
         end
-      end 
+      end
+
+      def backend_modal_render(type,form_object)
+        return "" unless ['google','facebook','seo_tags'].include?(type)
+        render("mokio/common/modals/modal_#{type}",f: form_object)
+      end
     end
   end
 end

data/app/helpers/mokio/backend/dynamic_fields_helper.rb

@@ -0,0 +1,91 @@
+module Mokio
+  module Backend
+    module DynamicFieldsHelper
+
+      def dynamic_fields_link_to_add_row(f, association, **args)
+        new_object = f.object.send(association).klass.new
+        id = new_object.object_id
+        partial = args[:partial] || association.to_s.singularize
+        add_new_button_value = args[:add_new_button_value] || I18n.t('backend.dynamic_fields.add_new_button')
+        css_class = args[:add_button_class] || "btn btn-primary"
+
+        fields = f.simple_fields_for(association, new_object, child_index: id) do |builder|
+          if block_given?
+            yield builder
+          else
+            render(partial, form_obj: builder)
+          end
+        end
+        link_to(add_new_button_value, '#',class: "add_fields " + css_class, data: {id: id, form: association,fields: fields.gsub("\n", "")})
+      end
+
+      def dynamic_fields_render_part(obj,**args)
+        partial = args[:partial] || association.to_s.singularize
+        render "#{partial}", form_obj: obj
+      end
+
+      # form_obj: main form builder object
+      # association: has_many association name (sym)
+      # args:
+      # partial: partial name with fields ( default association_name ")
+      # fields_container_class: css class for container when partials views should be loaded
+      # container_id: main container id for dynamic fields
+      # table_view: true/false - table html tags
+      # delete_button_class: css class
+      # add_button_class: add new row css class
+      # add_new_button_value: text in button add
+      # delete_row_button_value: Text in button delete
+      # delete_row_button_message_value: Confirmation message
+
+      def dynamic_fields_render_all(form_obj,association,**args,&block)
+
+        partial = args[:partial] || association.to_s.singularize
+        fields_container_class = args[:fields_container_class] || "dynamic_fields_container_fields"
+        container_id = args[:container_id] || "#{association.to_s.singularize}_container"
+
+        content_rows = form_obj.simple_fields_for association do |builder_object|
+          if block_given?
+            yield builder_object
+          else
+            dynamic_fields_render_part builder_object,partial: "#{partial}"
+          end
+        end
+
+        content = content_tag(:div,class: fields_container_class) do
+          content_rows
+        end
+
+        if(args[:table_view])
+          content = content_tag(:table,class: "table") do
+            content_tag(:tbody,class: fields_container_class) do
+              content_rows
+            end
+          end
+        end
+
+        add_row = content_tag('div',class: 'form-actions') do
+          dynamic_fields_link_to_add_row(form_obj, association, class: 'btn btn-primary',partial: "#{partial}",&block)
+        end
+
+        content << add_row
+
+        main_content = content_tag(:div,id: container_id) do
+          content
+        end
+
+        main_content << javascript_tag("backend_dynamic_fields('##{container_id}')")
+        main_content
+      end
+
+      def dynamic_fields_render_delete(form_obj,**args)
+        css_class = args[:delete_button_class] || "btn btn-primary"
+        delete_row_button_value = args[:delete_row_button_value] || I18n.t('backend.dynamic_fields.delete_row_button')
+        confrimation_message = args[:delete_row_button_message_value] || I18n.t('backend.dynamic_fields.delete_row_button_message')
+
+        content = form_obj.hidden_field :_destroy
+        content << link_to(delete_row_button_value, '#', data: { message: confrimation_message } ,class: "dynamic_fields_remove_row #{css_class}")
+      end
+
+    end
+  end
+end

data/app/models/devise_custom_failure.rb

@@ -2,4 +2,13 @@ class DeviseCustomFailure < Devise::FailureApp
   def redirect_url
     '/backend/users/sign_in'
   end
+
+  def respond
+    if http_auth?
+      http_auth
+    else
+      flash[:alert] = I18n.t(:invalid, :scope => [ :devise, :failure ])
+      redirect
+    end
+  end
 end

data/app/models/mokio/article.rb

@@ -19,7 +19,6 @@
 #  display_to   :date
 #  created_at   :datetime
 #  updated_at   :datetime
-#  meta_id      :integer
 #  gmap_id      :integer
 #
 module Mokio

data/app/models/mokio/contact.rb

@@ -20,7 +20,6 @@
 #  display_to   :date
 #  created_at   :datetime
 #  updated_at   :datetime
-#  meta_id      :integer
 #  gmap_id      :integer
 #
 module Mokio

data/app/models/mokio/content.rb

@@ -20,7 +20,6 @@
 #  display_to   :datetime
 #  created_at   :datetime
 #  updated_at   :datetime
-#  meta_id      :integer
 #  gmap_id      :integer
 #
 module Mokio

data/app/models/mokio/menu.rb

@@ -20,7 +20,6 @@
 #  content_editable :boolean          default(TRUE)
 #  modules_editable :boolean          default(TRUE)
 #  fake             :boolean          default(FALSE)
-#  meta_id          :integer
 #  slug             :string(255)
 # css_class :string
 # css_body_class :string

data/app/models/mokio/mov_gallery.rb

@@ -20,7 +20,6 @@
 #  display_to   :date
 #  created_at   :datetime
 #  updated_at   :datetime
-#  meta_id      :integer
 #  gmap_id      :integer
 #
 module Mokio

data/app/models/mokio/pic_gallery.rb

@@ -20,7 +20,6 @@
 #  display_to   :date
 #  created_at   :datetime
 #  updated_at   :datetime
-#  meta_id      :integer
 #  gmap_id      :integer
 #
 module Mokio

data/app/models/mokio/seo_tag.rb

@@ -0,0 +1,5 @@
+module Mokio
+  class SeoTag < ActiveRecord::Base
+    include Mokio::Concerns::Models::SeoTag
+  end
+end

data/app/models/mokio/support.rb

@@ -19,7 +19,6 @@
 #  display_to   :date
 #  created_at   :datetime
 #  updated_at   :datetime
-#  meta_id      :integer
 #  gmap_id      :integer
 #
 module Mokio

data/app/uploaders/ckeditor_picture_uploader.rb

@@ -27,8 +27,8 @@ class CkeditorPictureUploader < CarrierWave::Uploader::Base
   # def scale(width, height)
   #   # do something
   # end
-  
-  process :read_dimensions
+
+  process :extract_dimensions
 
   # Create different versions of your uploaded files:
   version :thumb do

data/app/views/devise/sessions/new.html.haml

@@ -32,6 +32,7 @@
           = f.button :submit, bt("sign_in"), class: 'btn btn-info', id: 'loginBtn'
           -if flash[:alert] && flash[:alert] != t("devise.failure.unauthenticated")
             %div
-              =flash[:alert]
+              %label.error
+                = flash[:alert]
         %br
         = link_to t("devise.link.forgot_password"), new_password_path(resource_name)

data/app/views/mokio/articles/_form.html.slim

@@ -1,8 +1,8 @@
 = render :partial => "mokio/common/main_pic", locals: {f:f}
 = render :partial => "mokio/contents/common", locals: {f:f}
-= f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},  include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
-= f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
-= f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
+= render_backend_input_lang_id(f)
+= render_backend_input_active(f)
+= render_backend_input_home_page(f)
 = f.input :title, disabled: !obj.display_editable_field?('title')
 = f.input :subtitle, disabled: !obj.display_editable_field?('subtitle'), :as => :string
 = f.input :intro,    :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full', :height => 150, :language => I18n.locale} }, disabled: !obj.display_editable_field?('intro')
@@ -14,3 +14,6 @@
     = t('menus.content_assoc')
   .span10
     =collection_select(:article, :menu_ids,menu_select_grouped(Mokio::Menu.all.includes(:content_links).arrange(:order => :seq)),:id,:name, {disabled: lambda{|s| s.fake.present? },selected:obj.menus.map {|j| j.id} },:multiple => true)
+
+/ #TODO - in all similar views
+/ DEPRECATION WARNING: Dangerous query method (method whose arguments are used as raw SQL) called with non-attribute argument(s): "coalesce(`mokio_menus`.`ancestry`, ''), seq". Non-attribute arguments will be disallowed in Rails 6.0. This method should not be called with user-provided values, such as request parameters or model attributes. Known-safe values can be passed by wrapping them in Arel.sql(). (called from __home_matt_projects_bloomnet_mokio_git_mokio_app_views_mokio_articles__form_html_slim___906233159799876300_69966117229420 at /home/matt/projects/bloomnet/mokio-git/mokio/app/views/mokio/articles/_form.html.slim:16)

data/app/views/mokio/common/_form_content.html.slim

@@ -6,17 +6,17 @@
     .row-fluid
       = simple_form_for obj, :html => { :class => 'form-horizontal' } do |f|
         = render :partial => "mokio/common/gmap", locals: {obj: obj, f: f} if obj.class.has_gmap_enabled?
-        = render :partial => "mokio/common/meta", locals: {obj: obj, f: f} if obj.class.has_meta_enabled?
-     
+        = backend_modal_render('seo_tags',f)
+
         = render :partial => "#{obj.class.to_s.tableize}/form", :locals => {f: f, obj: obj}
-        
+
         - if params[:action] != "edit" || !has_data_files?(obj)
           - cache [:form_buttons, obj] do
             .form-actions
               = btn_submit bt("save")
               = btn_submit bt("save_and_create_new"), true
               = btn_cancel "#{engine_root}#{obj.class.to_s.tableize.gsub("mokio/", "")}"
-    
+
       - if has_data_files?(obj) && params[:action] == "edit" && obj.default_data_file != Mokio::Youtube
         = render :template => "mokio/data_files/uploader"
       - if has_data_files?(obj) && obj.default_data_file == Mokio::Youtube && params[:action] == "edit"

data/app/views/mokio/common/edit.html.slim

@@ -3,8 +3,4 @@
   .box
     = box_title do
       = bt("edit_title", obj.respond_to?(:type) ? obj.type : @obj_class)
-
-    -if Mokio.multi_lang_contents == true && obj.kind_of?(Mokio::BaseContent)
-      = render :template => "mokio/common/multi_lang_form_content", locals: {obj: obj}
-    -else
-      = render :partial => "mokio/common/form_content", locals: {obj: obj}
+    = render :partial => "mokio/common/form_content", locals: {obj: obj}

data/app/views/mokio/common/index.html.slim

@@ -23,6 +23,9 @@
   javascript:
     var obj_table = "#{@obj_class.to_s.demodulize.tableize}"
     var obj_class = "#{@obj_path}"
+    var tmp = "#{set_sorting_param(@obj_class)}";
+    tmp = tmp.replace(/"/g, '"');
+    var default_sorting = JSON.parse(tmp);
   = javascript_include_tag "backend/datatable"
 
 /-if Mokio.solr_enabled == false

data/app/views/mokio/common/modals/_modal_seo_tags.html.slim

@@ -0,0 +1,47 @@
+-if obj.class.respond_to?('has_seo_tagable_enabled?') && obj.class.has_seo_tagable_enabled?
+  a data-toggle="modal" href=("#seo_tags" )
+    button.btn.btn-warning.btn-mini.box-form2.right
+      span.icon16.icomoon-icon-google-plus.white
+      = bt("seo_tags", Mokio::SeoTag)
+  #seo_tags.modal.fade role="dialog" aria-hidden="true" style="display:none;" aria-labelledby="meta_g_ModalLabel"
+    .modal-dialog
+      .modal-content
+        .modal-header
+          h3.modal-title.modal-photo id="meta_g_ModalLabel"
+            span.icon24.icomoon-icon-google-plus
+            = bt("seo_tags", Mokio::SeoTag)
+            small = " #{bt("seo_tags_desc", Mokio::SeoTag)}"
+        .modal-body
+          = dynamic_fields_render_all(f, :seo_tags, table_view: true) do | form_obj |
+            tr.dynamic_fields_row
+              td = form_obj.input :tag_key, collection: obj.class.name.constantize.seo_tagable_columns, include_blank: false, wrapper: :input_without_label, label_method: ->(el){ obj.class.name.constantize.render_label(el) }
+              td = form_obj.input :tag_value, input_html: {style: 'height:35px;  resize: none;'}, wrapper: :input_without_label
+              td = dynamic_fields_render_delete(form_obj)
+        .modal-footer
+          button.btn.btn-primary type="button" data-dismiss="modal" = bt("close")
+
+javascript:
+  $('#seo_tags').on('hide.bs.modal', function (e) {
+    var error_message = "#{I18n.t('activerecord.errors.models.mokio/seo_tag.attributes.tag_key.taken')}";
+    var validForm = true;
+    var inputArr = [];
+
+    $('#seo_tags').find('select').each(function () {
+      if($(this).is(":visible")) {
+        inputValue = $(this).val();
+        inputArr.push(inputValue);
+      }
+    });
+
+    var inputArrUniq = inputArr.filter(function(elem, index, self) {
+      return index === self.indexOf(elem);
+    });
+
+    if(inputArrUniq.length != inputArr.length) {
+      validForm = false;
+      e.preventDefault();
+      e.stopPropagation();
+      alert(error_message);
+      return false;
+    }
+  });

data/app/views/mokio/common/new.html.slim

@@ -3,7 +3,4 @@
   .box
     = box_title do
       = bt("new_title", @obj_class)
-    -if Mokio.multi_lang_contents == true && obj.kind_of?(Mokio::BaseContent)
-      = render :template => "mokio/common/multi_lang_form_content", locals: {obj: obj}
-    -else
-      = render :partial => "mokio/common/form_content", locals: {obj: obj}
+    = render :partial => "mokio/common/form_content", locals: {obj: obj}

data/app/views/mokio/contacts/_form.html.slim

@@ -1,12 +1,12 @@
-= f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},  include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
-= f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
-= f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
+= render_backend_input_lang_id(f)
+= render_backend_input_active(f)
+= render_backend_input_home_page(f)
 = f.input :title, disabled: !obj.display_editable_field?('title')
 = f.input :subtitle, disabled: !obj.display_editable_field?('subtitle'), :as => :string
 = f.input :intro,    :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full', :height => 150, :language => I18n.locale} }, disabled: !obj.display_editable_field?('intro')
 = f.input :content,  :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full', :height => 400, :language => I18n.locale} }, disabled: !obj.display_editable_field?('content')
+= f.input :recipient_emails, collection: [],:input_html => { :class => "recipients span10",multiple: true }, disabled: !obj.display_editable_field?('recipient_emails')
 
-= f.input :recipient_emails, :as => :string, :input_html => { :class => "recipients span10" }, disabled: !obj.display_editable_field?('recipient_emails')
 .row-fluid
   label.form-label.span2
     = t('menus.content_assoc')
@@ -40,12 +40,14 @@
               = "%content% - #{t('contacts.form_content')}"
 
       = t.input :tpl, :label => "",  :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 300} }
-   
+
 
 = f.hidden_field :contact, value: true
 = f.hidden_field :intro, value: ""
 
 - content_for :js do
-  = javascript_include_tag 'backend/plugins/forms/select/select2.min'
   javascript:
-    $(".recipients").select2({tags:[]});
+    $(".recipients").select2({
+    tags: true,
+    tokenSeparators: [',', ' ']
+    })

data/app/views/mokio/contents/new.html.slim

@@ -18,8 +18,7 @@
 
             = simple_form_for obj, :html => { :class => 'form-horizontal' } do |f|
               = render :partial => "mokio/common/gmap", locals: {content: content, f: f} if content.class.has_gmap_enabled?
-              = render :partial => "mokio/common/meta", locals: {content: content, f: f} if content.class.has_meta_enabled?
-
+              = backend_modal_render('seo_tags',f)
               = render :partial => "#{content.class.to_s.tableize}/form", :locals => {f: f, content: content}
 
               - if params[:action] != "edit" || !has_data_files?(content)