coalla-cms 0.5.2.4 → 0.6.0.9

data/app/views/admin/common/_menu_section.haml

@@ -1,4 +1,4 @@
-- active = current_page?(item.path)
+- active = current_page?(item.path) || item.section_name.to_s == controller_name
 %li{class: active && 'active'}
   = link_to item.path do
     %i{class: item.icon}

data/app/views/admin/common/_nested_fields_for.html.haml

@@ -1,6 +1,11 @@
 - partial = "#{collection.to_s.singularize}_fields"
-= field_set section_name do
-  = f.fields_for collection do |builder|
-    = render 'admin/common/nested_fields_for_element',  builder: builder, partial: partial
-  .nested_buttons
-    = link_to_add_fields('Добавить', f, collection)
+= field_set section_name, data: {sortable_blocks: options[:sort]} do
+  = f.fields_for collection, record_object, options do |builder|
+    = render('admin/common/nested_fields_for_element', builder: builder, partial: partial, options: options, block: block)
+  - if options[:add]
+    .nested_buttons
+      - new_object = f.object.send(collection).klass.new
+      - id = new_object.object_id
+      - fields = f.fields_for(collection, new_object, options.merge(child_index: id)) do |builder|
+        = render('admin/common/nested_fields_for_element', builder: builder, partial: partial, options: options, block: block)
+      = link_to(t('admin.common.new'), '#', class: 'add_fields btn btn-success', data: {id: id, fields: fields.gsub("\n", '')})

data/app/views/admin/common/_nested_fields_for_element.html.haml

@@ -1,5 +1,21 @@
-.fields_container{style: (builder.object.marked_for_destruction? ? 'display:none;' : 'position:relative'), class: 'well'}
-  = render partial, builder: builder
-  = builder.hidden_field :_destroy
-  = link_to '#', class: 'btn btn-danger remove_field', style:'position: absolute; top: 20px; right: 30px;' do
-    %i.glyphicon.glyphicon-trash
+.fields_container{style: (builder.object.try(:marked_for_destruction?) ? 'display:none;' : 'position:relative'), class: 'well'}
+  - if !options[:include_id] && builder.object.try(:persisted?)
+    = builder.hidden_field :id
+  - if options[:sort] || options[:destroy]
+    .row.form-group
+      .col-md-2.col-xs-2
+        - if options[:sort]
+          = link_to '#', data: {sort_up: true} do
+            %i.glyphicon.glyphicon-arrow-up
+          = link_to '#', data: {sort_down: true} do
+            %i.glyphicon.glyphicon-arrow-down
+      .col-md-1.col-md-offset-9.col-xs-1.col-xs-offset-8
+        - if options[:destroy]
+          = link_to '#', class: 'btn btn-danger remove_field' do
+            %i.glyphicon.glyphicon-trash
+  - if options[:destroy]
+    = builder.hidden_field :_destroy
+  - if block.present?
+    = capture(builder, options, &block)
+  - else
+    = render partial, builder: builder, options: options

data/app/views/admin/common/_table_template.html.haml

@@ -2,13 +2,32 @@
   %table.table.table-striped
     %thead
       %tr
-        - definitions.each do |column|
-          %th{class: th_class(column)}
-            = column.title
+        - definitions.each do |definition|
+          %th{class: th_class(definition)}
+            - if !definition.sort
+              = definition.title
+            - else
+              - url_params = params.permit!.to_h
+              - sort_by, sort_direction = sort_order.split("\s")
+              - if definition.sort == sort_by
+                - arrow_class = sort_direction == 'desc' ? 'glyphicon-sort-by-attributes-alt' : 'glyphicon-sort-by-attributes'
+                - direction = sort_direction == 'desc' ? 'asc' : 'desc'
+                = link_to url_for(url_params.merge(sort_by: sort_by, sort_direction: direction)) do
+                  = "#{definition.title}&nbsp;<i class='glyphicon #{arrow_class}'></i>".html_safe
+              - else
+                = link_to url_for(url_params.merge(sort_by: definition.sort, sort_direction: 'asc')) do
+                  = "#{definition.title}&nbsp;<i class='glyphicon glyphicon-sort'></i>".html_safe
     %tbody
       - items.each do |item|
         %tr{class: tr_class(row_class, item)}
-          - definitions.each do |column|
-            %td{class: td_class(column)}<
-              = column.value(item, self)
-
+          - definitions.each do |definition|
+            - if definition.edit
+              - edit = definition.edit.dup
+              - url_option = edit.delete(:url)
+              - url = url_option.is_a?(Proc) ? url_option.(item) : url_for(action: :edit_column, id: item)
+              - data = {url: url, editable_column: true}.merge(edit).map{|key,value| [key, value.to_s]}.to_h
+              %td{class: td_class(definition), data: data}<
+                = definition.value(item, self)
+            - else
+              %td{class: td_class(definition)}<
+                = definition.value(item, self)

data/app/views/admin/common/_upload_form.html.haml

@@ -1,4 +1,5 @@
-= form_tag "###URL###", multipart: true, remote: true, style: 'display: none;', method: :post, authenticity_token: true do
+= form_tag "###URL###", multipart: true, remote: true, style: 'display: none;', method: :post do
+  = hidden_field_tag :authenticity_token, form_authenticity_token
   = hidden_field_tag :container, '###CONTAINER###', id: nil
   = hidden_field_tag :version,   '###VERSION###', id: nil
   = hidden_field_tag :free_size,   '###FREE_SIZE###', id: nil

data/app/views/admin/editable_columns/edit/_boolean.haml

@@ -0,0 +1,2 @@
+.checkbox
+  = builder.check_box options.column

data/app/views/admin/editable_columns/edit/_date.haml

@@ -0,0 +1,2 @@
+.form-group
+  = builder.text_field options.column, class: 'form-control', data: {calendar_date: true}

data/app/views/admin/editable_columns/edit/_datetime.haml

@@ -0,0 +1,3 @@
+.form-group
+  - value = builder.object.try(options.column).try(:strftime, '%Y-%m-%d %H:%M')
+  = builder.text_field options.column, class: 'form-control', data: {calendar_datetime: true}, value: value

data/app/views/admin/editable_columns/edit/_enumerize.haml

@@ -0,0 +1,2 @@
+.form-group
+  = builder.select options.column, controller_model.send(options.column).options, {}, class: 'form-control'

data/app/views/admin/editable_columns/edit/_string.haml

@@ -0,0 +1,2 @@
+.form-group
+  = builder.text_field options.column, class: 'form-control'

data/app/views/admin/editable_columns/edit/_text.haml

@@ -0,0 +1,2 @@
+.form-group
+  = builder.text_field options.column, class: 'form-control'

data/app/views/admin/editable_columns/edit/_time.haml

@@ -0,0 +1,3 @@
+.form-group
+  - value = builder.object.try(options.column).try(:strftime, '%H:%M')
+  = builder.text_field options.column, class: 'form-control', data: {calendar_time: true}, value: value

data/app/views/admin/editable_columns/edit_column.haml

@@ -0,0 +1,8 @@
+= twitter_form_for item, url: url_for(action: :update_column, id: item), method: :put, remote: true, as: :item, html: {class: 'form-inline', data: {editable_column_form: true}} do |f|
+  = hidden_field_tag :column, options.column
+  = hidden_field_tag :custom, options.custom
+  = render partial: column_partial, locals: {builder: f, options: options}
+  = button_tag type: 'submit', class: 'btn btn-success btn-sm' do
+    %i.glyphicon.glyphicon-ok
+  = button_tag type: 'button', class: 'btn btn-default btn-sm', data: {editable_column_cancel: true} do
+    %i.glyphicon.glyphicon-remove

data/app/views/admin/editable_columns/result/_boolean.haml

@@ -0,0 +1,2 @@
+- if item.try(options.column)
+  %i.glyphicon.glyphicon-check

data/app/views/admin/editable_columns/result/_date.haml

@@ -0,0 +1 @@
+= item.try(options.column).try(:strftime, '%d.%m.%Y')

data/app/views/admin/editable_columns/result/_datetime.haml

@@ -0,0 +1 @@
+= item.try(options.column).try(:strftime, '%d.%m.%Y %H:%M')

data/app/views/admin/editable_columns/result/_enumerize.haml

@@ -0,0 +1 @@
+= item.try(options.column).try(:text)

data/app/views/admin/editable_columns/result/_string.haml

@@ -0,0 +1 @@
+= item.try(options.column).to_s.html_safe

data/app/views/admin/editable_columns/result/_text.haml

@@ -0,0 +1 @@
+= item.try(options.column).to_s.html_safe

data/app/views/admin/editable_columns/result/_time.haml

@@ -0,0 +1 @@
+= item.try(options.column).try(:strftime, '%H:%M')

data/app/views/admin/site_meta_tags/index.html.haml

@@ -1,5 +1,5 @@
-%h1 Мета-тэги
+%h1= SiteMetaTags.model_name.human
 
 = table_for(SiteMetaTags).content(@meta_tags) do |t|
   - t.column :identifier_text
-  - t.action ->(item){  edit_link(url_for(action: :edit, id: item.id))}
+  - t.edit

data/app/views/layouts/admin.html.haml

@@ -5,6 +5,7 @@
     = favicon_link_tag
     = stylesheet_link_tag 'admin/admin', media: 'all'
     = javascript_include_tag 'admin/admin'
+    = yield :js
     = csrf_meta_tags
   = yield(:head)
   :css
@@ -31,6 +32,10 @@
     .wrapper
       .page-wrapper#content
         = yield
+    #modal.modal.fade{role: 'dialog', tabindex: '-1'}
+      .modal-dialog.modal-lg{role: 'document'}
+        .modal-content
+          = yield :modal
 
     :javascript
       $(function () {
@@ -39,6 +44,13 @@
             PhotoUploader.addUploadListener();
         };
         addUploadListener();
+
         window.NestedFormCallbacks = window.NestedFormCallbacks || [];
         window.NestedFormCallbacks.push(addUploadListener);
+
+        window.EditableColumnCallbacks = window.EditableColumnCallbacks || [];
+        window.EditableColumnCallbacks.push(addUploadListener);
+
+        window.RemoteModalCallbacks = window.RemoteModalCallbacks || [];
+        window.RemoteModalCallbacks.push(addUploadListener);
       });

data/app/views/structure/_section.haml

@@ -2,16 +2,9 @@
   .well.well-lg
     %h3
       = link_to section.name.html_safe, section.path
-      - if section.counter
+      - if section.show_menu_counter? && section.counter
          
         %span.badge.badge-primary
           = section.counter.call
     - if section.description
-      %p= section.description
-    - if section.creation_path
-      = link_to section.creation_path, class: 'btn btn-success' do
-        %i.glyphicon.glyphicon-plus
-         
-        = t('admin.common.new')
-
-
+      %p= section.description

data/coalla-cms.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "coalla/cms/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'coalla/cms/version'
 
 Gem::Specification.new do |s|
   s.name = 'coalla-cms'
@@ -16,19 +16,17 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_dependency 'railties', '~> 4.0'
-  s.add_dependency 'rails', '~> 4.0'
-  s.add_dependency 'devise'
-  s.add_dependency 'haml'
-  s.add_dependency 'coffee-rails'
-  s.add_dependency 'sass-rails'
-  s.add_dependency 'coalla-deploy', '~> 0.1'
+  s.add_dependency 'rails', '~> 5.0'
   s.add_dependency 'jquery-rails'
+  s.add_dependency 'listen'
   s.add_dependency 'jquery-ui-rails'
   s.add_dependency 'jquery-timepicker-addon-rails'
   s.add_dependency 'js-routes'
+  s.add_dependency 'devise'
+  s.add_dependency 'haml'
+  s.add_dependency 'sass-rails'
   s.add_dependency 'carrierwave'
   s.add_dependency 'ckeditor'
   s.add_dependency 'mini_magick'
@@ -37,6 +35,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rmagick'
   s.add_dependency 'will_paginate'
   s.add_dependency 'standalone_typograf', '~> 3.0.2'
-  s.add_dependency 'meta-tags', '~> 2.1.0'
+  s.add_dependency 'meta-tags', '~> 2.4.0'
 
+  s.required_ruby_version = '>= 2.0.0'
 end

data/lib/coalla/builders/actions_column_definition.rb

@@ -0,0 +1,44 @@
+module Coalla
+  class ActionsColumnDefinition < ColumnDefinition
+    def initialize
+      self.title = I18n.t('admin.common.actions')
+      @actions = []
+    end
+
+    def cols
+      @cols || @actions.size % 2 + @actions.size / 2
+    end
+
+    def col_class
+      "col-xs-#{cols}"
+    end
+
+    def cols=(value)
+      @cols = value
+    end
+
+    def value(item, context = self)
+      @actions.collect do |action|
+        options = action.second
+        if options[:if]
+          context.instance_exec(item, &action.first) if options[:if].call(item)
+        else
+          context.instance_exec(item, &action.first)
+        end
+      end.compact.join(' ').html_safe
+    end
+
+    def action(method, options = {})
+      @actions << case method
+                    when :edit
+                      [->(item) { edit_link(url_for(action: :edit, id: item)) }, options.merge(action_name: :edit)]
+                    when :delete
+                      [->(item) { delete_link(url_for(action: :destroy, id: item)) }, options.merge(action_name: :destroy)]
+                    when Proc
+                      [method, options]
+                    else
+                      raise "unsupported method: #{method.inspect}"
+                  end
+    end
+  end
+end

data/lib/coalla/builders/admin_structure.rb

@@ -0,0 +1,86 @@
+#encoding: utf-8
+module Coalla
+  class AdminStructure
+    Section = Struct.new(:name, :path, :icon, :description, :counter, :show_menu_counter, :creation_path, :section_name) do
+
+      def show_menu_counter?
+        show_menu_counter.present?
+      end
+
+    end
+
+    Separator = Struct.new(:title)
+
+    CONFIG_FILE_NAME = 'structure.rb'
+
+    attr_accessor :sections
+
+    def initialize(controller, routes)
+      @controller = controller
+      @sections = []
+      self.class.include(routes.url_helpers)
+      load_sections_from_config
+    end
+
+    def menu_items
+      dashboard_item = Section.new(I18n.t('admin.common.dashboard'), admin_dashboard_path, 'glyphicon glyphicon-align-left')
+      [dashboard_item] + @sections
+    end
+
+    def sections
+      @sections.find_all { |section| section.is_a?(Section) }
+    end
+
+    private
+
+    def load_sections_from_config
+      config_path = Rails.root.join('config', CONFIG_FILE_NAME).to_s
+      if File.exist?(config_path)
+        instance_eval(File.read(config_path), config_path)
+      end
+    end
+
+    # Options:
+    # creation_path - false or path string
+    def section(section_reference, options = {})
+      path = options.delete(:path)
+      icon = options.delete(:icon)
+      description = options.delete(:description)
+      counter = options.delete(:counter)
+      show_menu_counter = options.delete(:show_menu_counter)
+      creation_path = options.delete(:creation_path)
+      if section_reference.is_a?(Class)
+        section_name = section_reference.model_name.human
+        path = send("admin_#{section_reference.model_name.route_key}_path") unless path
+        counter = ->() { section_reference.count } unless counter
+        creation_path = send("new_admin_#{section_reference.model_name.singular}_path") if creation_path.nil?
+      else
+        section_name = section_reference
+      end
+      return unless policy.section_enabled?(options[:section_name], options)
+      @sections << Section.new(section_name, path, icon, description, counter, show_menu_counter, creation_path, options[:section_name])
+    end
+
+    def lookup_section(section_references = I18n.t('activerecord.models.lookup'), category = nil, options = {})
+      default_options = {path: send('admin_lookups_index_path', category: category),
+                         icon: 'glyphicon glyphicon-wrench',
+                         description: ''}.merge(options)
+      section(section_references, default_options)
+    end
+
+    def meta_tags_section(section_references = I18n.t('activerecord.models.meta_tags'), options = {})
+      default_options = {path: send('admin_meta_tags_path'),
+                         icon: 'glyphicon glyphicon-tag',
+                         description: ''}.merge(options)
+      section(section_references, default_options)
+    end
+
+    def separator(title)
+      @sections << Separator.new(title)
+    end
+
+    def policy
+      @controller.policy
+    end
+  end
+end

data/lib/coalla/builders/column_definition.rb

@@ -0,0 +1,9 @@
+module Coalla
+  class ColumnDefinition
+    attr_accessor :title, :cols, :col_class, :value_extractor, :align, :sort, :edit
+
+    def value(item, context = self)
+      self.value_extractor.call(item)
+    end
+  end
+end