coalla-cms 0.4.4.3 → 0.5.1.8

data/app/controllers/admin/lookups_controller.rb

@@ -3,7 +3,12 @@ module Admin
   class LookupsController < BaseController
 
     def index
-      @lookups = Lookup.order(:code, :created_at)
+      @category = params[:category]
+      @lookups = Lookup.where(category: @category).order(:code, :created_at)
+      if @lookups.blank? && @category.present?
+        redirect_to admin_lookups_index_path
+        return
+      end
     end
 
     def new
@@ -13,7 +18,7 @@ module Admin
     def create
       @lookup = Lookup.new(params[:lookup])
       if @lookup.save
-        redirect_to admin_lookups_path
+        redirect_to admin_lookups_index_path(category: @lookup.category)
       else
         render :new
       end
@@ -30,7 +35,7 @@ module Admin
     def update
       @lookup = Lookup.find(params[:id])
       if @lookup.update_attributes(params[:lookup].permit!)
-        redirect_to admin_lookups_path
+        redirect_to admin_lookups_index_path(category: @lookup.category)
       else
         render :edit
       end
@@ -39,7 +44,7 @@ module Admin
     def destroy
       @lookup = Lookup.find(params[:id])
       @lookup.destroy
-      redirect_to admin_lookups_path
+      redirect_to admin_lookups_index_path(category: @lookup.category)
     end
 
   end

data/app/controllers/admin/notifier_controller.rb

@@ -0,0 +1,7 @@
+module Admin
+  class NotifierController < BaseController
+    def test_sending
+      raise('Test notifier.')
+    end
+  end
+end

data/app/controllers/admin/site_meta_tags_controller.rb

@@ -0,0 +1,43 @@
+module Admin
+
+  class SiteMetaTagsController < BaseController
+
+    def index
+      @meta_tags = SiteMetaTags.order(:created_at)
+    end
+
+    def new
+      @meta_tags = SiteMetaTags.new
+    end
+
+    def create
+      @meta_tags = SiteMetaTags.new(params[:site_meta_tags].permit!)
+      if @meta_tags.save
+        redirect_to admin_meta_tags_path
+      else
+        render :new
+      end
+    end
+
+    def edit
+      @meta_tags = SiteMetaTags.find(params[:id])
+    end
+
+    def update
+      @meta_tags = SiteMetaTags.find(params[:id])
+      if @meta_tags.update_attributes(params[:site_meta_tags].permit!)
+        redirect_to admin_meta_tags_path
+      else
+        render :edit
+      end
+    end
+
+    def destroy
+      @meta_tags = SiteMetaTags.find(params[:id])
+      @meta_tags.destroy
+      redirect_to admin_meta_tags_path
+    end
+
+  end
+
+end

data/app/controllers/concerns/page_meta_tags.rb

@@ -0,0 +1,71 @@
+module PageMetaTags
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :current_url
+
+
+    def set_page_meta_tags(options={})
+      id = options.delete(:identifier)
+
+      tags = {
+          site: tag_value(:site, id),
+          title: title_for(tag_value(:title, id)),
+          description: tag_value(:description, id),
+          image: tag_value(:image, id),
+          url: tag_value(:url, id) || current_url,
+
+          og: {
+              title: title_for(tag_value(:title, id, true)).last || defaults.site,
+              description: tag_value(:description, id, true),
+              image: tag_value(:image, id, true),
+              url: tag_value(:url, id, true) || current_url,
+          }
+      }
+
+      tags.deep_merge!(options)
+
+      set_meta_tags(tags)
+    end
+
+    private
+
+    def tag_value(tag_name, identifier, og = false)
+      variants = []
+
+      og_tag_name = "og_#{tag_name}".to_sym if og
+
+      variants << page_tags(identifier).send(:try, og_tag_name) if og
+      variants << page_tags(identifier).send(:try, tag_name)
+      variants << defaults.send(:try, og_tag_name) if og
+      variants << defaults.send(:try, tag_name)
+
+      if tag_name == :image
+        variants = variants.map { |v| URI.join(view_context.root_url, v.try(:url, :main)).to_s if v.try(:url, :main).present? }
+      end
+
+      result = variants.detect(&:present?)
+      return if result.blank?
+      result.html_safe
+    end
+
+    def title_for(title)
+      [title].flatten
+    end
+
+    def current_url
+      request.original_url
+    end
+
+    def defaults
+      @default_tags ||= SiteMetaTags.default_tags
+    end
+
+    def page_tags(identifier)
+      return if identifier.blank?
+
+      @page_tags ||= {}
+      @page_tags[identifier] ||= SiteMetaTags.find_by(identifier: identifier)
+    end
+  end
+end

data/app/helpers/admin/lookup_helper.rb

@@ -0,0 +1,23 @@
+module Admin
+  module LookupHelper
+    def tooltip_lookup_data(lookup)
+      if lookup.try(:tooltip).present?
+        {toggle: 'tooltip', placement: 'top', title: lookup.tooltip}
+      else
+        {}
+      end
+    end
+
+    def format_lookup(lookup)
+      if %w(string memo wysiwyg integer float).include?(lookup.type_code)
+        raw(truncate(strip_tags(lookup.value), length: 200))
+      elsif lookup.type_code == 'boolean'
+        lookup.value == '1' ? '<i class="glyphicon glyphicon-check"></i>'.html_safe : ''
+      elsif lookup.type_code == 'file'
+        lookup.file.try(:file).try(:filename) || ''
+      elsif lookup.type_code == 'enum'
+        enum_lookup_text(lookup.code)
+      end
+    end
+  end
+end

data/app/helpers/common_helper.rb

@@ -1,3 +1,5 @@
+require 'standalone_typograf'
+
 module CommonHelper
 
   def copyright(start_year)
@@ -13,4 +15,8 @@ module CommonHelper
     'display: none;' + style
   end
 
+  def ty(text)
+    ::StandaloneTypograf::Typograf.new(text, mode: :html).prepare.html_safe
+  end
+
 end

data/app/helpers/lookup_helper.rb

@@ -1,40 +1,67 @@
 module LookupHelper
 
-  def lookup code, default = nil, &block
-    _lookup code, 'string', default, &block
+  def lookup(code, default = nil, &block)
+    _lookup(code, 'string', default, &block)
   end
 
-  def memo_lookup code, default = nil, &block
+  def integer_lookup(code, default = nil, &block)
+    _lookup(code, 'integer', default, &block).to_i
+  end
+
+  def float_lookup(code, default = nil, &block)
+    _lookup(code, 'float', default, &block).to_f
+  end
+
+  def boolean_lookup(code, default = nil, &block)
+    _lookup(code, 'boolean', default, &block) == '1'
+  end
+
+  def enum_lookup_value(code, default = nil, &block)
+    _lookup(code, 'enum', default, &block).to_sym
+  end
+
+  def file_lookup(code)
+    Lookup.find_by(code: code, type_code: 'file')
+  end
+
+  def enum_lookup_text(code)
+    value = enum_lookup_value(code)
+    return if value.blank?
+    l = Lookup.where(code: code, type_code: 'enum').first
+    l.value_options[value]
+  end
+
+  def memo_lookup(code, default = nil, &block)
     sf(unsafe_memo_lookup(code, default, &block))
   end
 
-  def unsafe_memo_lookup code, default = nil, &block
-    _lookup code, 'memo', default, &block
+  def unsafe_memo_lookup(code, default = nil, &block)
+    _lookup(code, 'memo', default, &block)
   end
 
-  def wysiwyg_lookup code, default = nil, &block
-    raw(_lookup code, 'wysiwyg', default, &block)
+  def wysiwyg_lookup(code, default = nil, &block)
+    raw(_lookup(code, 'wysiwyg', default, &block))
   end
 
-  def lookup_name code
+  def lookup_name(code)
     t("lookups.#{code}")
   end
 
-  def sf text
+  def sf(text)
     h(text).gsub("\n", "<br/>").html_safe
   end
 
   private
 
-  def _lookup code, type, default, &block
+  def _lookup(code, type, default, &block)
     l = Lookup.where(code: code, type_code: type).first
     return l.value if l
 
     value = if block.present?
-      capture(self, &block)
-    else
-      default
-    end
+              capture(self, &block)
+            else
+              default
+            end
     value = value.strip if value
 
     l = Lookup.create!(code: code, value: value, type_code: type)

data/app/helpers/twitter_builder_helper.rb

@@ -15,7 +15,7 @@ module TwitterBuilderHelper
   class ActionsColumnDefinition < ColumnDefinition
 
     def initialize
-      self.title = 'Действия'
+      self.title = I18n.t('admin.common.actions')
       @actions = []
     end
 
@@ -201,30 +201,30 @@ module TwitterBuilderHelper
   end
 
   def create_link path
-    content = "<i class='glyphicon glyphicon-plus'></i>&nbsp;&nbsp;Добавить".html_safe
+    content = "<i class='glyphicon glyphicon-plus'></i>&nbsp;&nbsp;#{I18n.t('admin.common.new')}".html_safe
     link_to content, path, class: 'btn btn-success'
   end
 
   def sort_link path
-    content = "<i class='glyphicon glyphicon-random'></i>&nbsp;&nbsp;Сортировать".html_safe
+    content = "<i class='glyphicon glyphicon-random'></i>&nbsp;&nbsp;#{I18n.t('admin.common.sort')}".html_safe
     link_to content, path, class: 'btn btn-primary'
   end
 
   def edit_link path
     content = "<i class='glyphicon glyphicon-pencil'></i>".html_safe
-    link_to content, path, class: 'btn btn-default btn-xs', title: 'Редактировать'
+    link_to content, path, class: 'btn btn-default btn-xs', title: I18n.t('admin.common.edit')
   end
 
   def delete_link path
     content = "<i class='glyphicon glyphicon-trash'></i>".html_safe
-    link_to content, path, data: {confirm: 'Вы уверены?'}, method: :delete, class: 'btn btn-danger btn-xs', title: 'Удалить'
+    link_to content, path, data: {confirm: I18n.t('admin.common.sure')}, method: :delete, class: 'btn btn-danger btn-xs', title: I18n.t('admin.common.delete')
   end
 
-  def cancel_action path, name = 'Отменить'
+  def cancel_action path, name = I18n.t('admin.common.cancel')
     link_to name, path, class: 'btn btn-default'
   end
 
-  def back_action name = 'Вернуться', path = back_uri
+  def back_action name = I18n.t('admin.common.return'), path = back_uri
     link_to name, path, class: 'btn btn-default'
   end
 

data/app/helpers/twitter_form_builder.rb

@@ -79,11 +79,16 @@ class TwitterFormBuilder < ActionView::Helpers::FormBuilder
     string(method, merge_options({data: {'calendar-datetime' => true}, div_class: 'col-md-3', value: value}, options))
   end
 
-  def save text = 'Сохранить'
+  def time(method, options = {})
+    value = object.try(method).try(:strftime, '%H:%M')
+    string(method, merge_options({data: {'calendar-time' => true}, div_class: 'col-md-2', value: value}, options))
+  end
+
+  def save text = I18n.t('admin.common.save')
     submit text, name: :save, class: 'btn btn-success wymupdate'
   end
 
-  def apply text = 'Применить'
+  def apply text = I18n.t('admin.common.apply')
     submit text, name: :apply, class: 'btn btn-default wymupdate'
   end
 
@@ -138,10 +143,11 @@ class TwitterFormBuilder < ActionView::Helpers::FormBuilder
   end
 
   def multi_field(relation_name, options = {})
+    reflection = self.object.class.reflections[relation_name] || self.object.class.reflections[relation_name.to_s]
     options = {search_field_name: :name,
                show_all_on_focus: false,
                use_cache: true,
-               relation_model_name: self.object.class.reflections[relation_name].klass.model_name.singular}.merge!(options)
+               relation_model_name: reflection.klass.model_name.singular}.merge!(options)
     options[:source] ||= @template.admin_autocomplete_path(options[:relation_model_name], options[:search_field_name])
     string "#{relation_name}_tokens", title: self.object.class.human_attribute_name(relation_name),
            data: {

data/app/models/lookup.rb

@@ -2,5 +2,27 @@ class Lookup < ActiveRecord::Base
 
   validates_presence_of :code
   validates_uniqueness_of :code
+  validates_numericality_of :value, only_integer: true, if: ->(lookup) { lookup.type_code == 'integer' }
+  validates_numericality_of :value, if: ->(lookup) { lookup.type_code == 'float' }
+
+  mount_uploader :file, FileUploader
+
+  def value_options
+    attr_value = read_attribute(:value_options)
+
+    if attr_value.present?
+      ActiveSupport::JSON.decode(attr_value).with_indifferent_access
+    else
+      {}
+    end
+  end
+
+  def value_options=(value)
+    write_attribute(:value_options, ActiveSupport::JSON.encode(value).to_s) if value.present?
+  end
+
+  def select_options
+    value_options.map { |key, value| [value, key] }
+  end
 
 end

data/app/models/site_meta_tags.rb

@@ -0,0 +1,16 @@
+class SiteMetaTags < ActiveRecord::Base
+  self.table_name = 'meta_tags'
+
+  mount_uploader :image, MetaTagsImageUploader
+  mount_uploader :og_image, MetaTagsImageUploader
+
+  validates_uniqueness_of :identifier
+
+  def self.default_tags
+    where(identifier: :default).first
+  end
+
+  def identifier_text
+    identifier == 'default' ? 'Тэги по умолчанию' : identifier
+  end
+end

data/app/uploaders/meta_tags_image_uploader.rb

@@ -0,0 +1,5 @@
+class MetaTagsImageUploader < GenericImageUploader
+  version :main do
+    resize_to_limit 1024, 1024
+  end
+end

data/app/utils/admin_structure.rb

@@ -17,13 +17,14 @@ class AdminStructure
 
   attr_accessor :sections
 
-  def initialize
+  def initialize(controller)
+    @controller = controller
     @sections = []
     load_sections_from_config
   end
 
   def menu_items
-    dashboard_item = Section.new('Сводка', admin_dashboard_path, 'glyphicon glyphicon-align-left')
+    dashboard_item = Section.new(I18n.t('admin.common.dashboard'), admin_dashboard_path, 'glyphicon glyphicon-align-left')
     [dashboard_item] + @sections
   end
 
@@ -60,6 +61,20 @@ class AdminStructure
     @sections << Section.new(section_name, path, icon, description, counter, show_menu_counter, creation_path)
   end
 
+  def lookup_section(section_references = 'Настройки', category = nil, options = {})
+    default_options = options.merge(path: send('admin_lookups_index_path', category: category),
+                                    icon: 'glyphicon glyphicon-wrench',
+                                    description: 'Раздел содержит различные настройки и тексты')
+    section(section_references, default_options)
+  end
+
+  def meta_tags_section(section_references = 'Мета-тэги', options = {})
+    default_options = options.merge(path: send('admin_meta_tags_path'),
+                                    icon: 'glyphicon glyphicon-tag',
+                                    description: 'Раздел содержит мета-тэги')
+    section(section_references, default_options)
+  end
+
   def separator(title)
     @sections << Separator.new(title)
   end

data/app/views/admin/base/_sort.haml

@@ -1,9 +1,9 @@
 - model_name = controller_name.classify.constantize
 .page-header
   %h1
-    Сортировка 
+    #{t('admin.common.sort')} 
     %small
-      Вы можете перетаскивать строки в таблице
+      #{t('admin.common.sort_title')}
 
 = form_tag action: :sort, method: :post do
   %table.table.table-striped
@@ -16,7 +16,7 @@
           = hidden_field_tag "#{controller_name}[#{sortable.id}]", sortable.id
           %td= sortable.send(attribute_name)
   = actions do
-    = submit_tag 'Сохранить', class: 'btn btn-success'
+    = submit_tag t('admin.common.save'), class: 'btn btn-success'
     = cancel_action action: :index
 
 :javascript

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

@@ -1,14 +1,18 @@
 - file = f.object.send field
+- file_label = I18n.t("activerecord.attributes.#{f.object.class.model_name.singular}.#{field}_name")
 .control-group{data: {file_upload_container: true}}
   .controls.alert.alert-info.span3
-    %p{id: "#{field}-name-label", style: "margin-bottom: 10px;", data: {file_upload_title: true}}
+    %p{id: "#{field}-name-label", style: 'margin-bottom: 10px;', data: {file_upload_title: true, label: file_label}}
       - if file.file
         = file.file.filename
         = surround '(', ')' do
           = number_to_human_size(file.file.size)
       - else
-        = I18n.t("activerecord.attributes.#{f.object.class.model_name.singular}.#{field}_name")
+        = file_label
 
-    .custom-file{style: 'cursor: pointer; height: 31px; overflow: hidden; position: relative; width: 140px;'}
+    .custom-file{style: 'cursor: pointer; height: 34px; overflow: hidden; position: relative; width: 140px;'}
       .btn.btn-primary{style: 'position: absolute; left: 0; right: 0;'} Загрузить
-      = f.file_field field, class: 'span5', style: "font-size: 100px; opacity: 0; position: absolute;", data: {file_upload: true}
+      = f.file_field field, class: 'span5', style: 'font-size: 100px; opacity: 0; position: absolute;', data: {file_upload: true}
+    = link_to '#', class: 'btn btn-danger', style:'position: absolute; top: 20px; right: 30px;', data: {file_remove_btn: true} do
+      %i.glyphicon.glyphicon-trash
+    = f.hidden_field "remove_#{field}", data: {file_remove_flag: true}

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

@@ -5,7 +5,7 @@
       %span.icon-bar
       %span.icon-bar
       %span.icon-bar
-    = link_to 'Главная', root_path, class: 'navbar-brand'
+    = link_to t('admin.common.main_page'), root_path, class: 'navbar-brand'
 
   #navbar-collapse.navbar-collapse.collapse
     %nav.nav.navbar-nav.side-nav{role: "navigation"}
@@ -14,14 +14,15 @@
     %ul.nav.navbar-nav.navbar-right
       %li
         %p.navbar-text
-          Вы вошли как
+          = t('admin.common.logged_in_as')
            
           = link_to '#', class: 'navbar-link' do
             %i.glyphicon.glyphicon-user
              
-            Администратор
+            = current_administrator.email
       %li
         = link_to destroy_administrator_session_path, method: Devise.sign_out_via, class: 'navbar-link' do
           %i.glyphicon.glyphicon-log-out
            
-          Выход
+          = t('admin.auth.sign_out')
+

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

@@ -32,7 +32,7 @@
     .col-md-4.col-lg-2
     .col-md-8.col-lg-10
       .custom-file{style: 'position: relative; display: inline-block; width: 140px; height: 34px; overflow: hidden;'}
-        .btn.btn-primary{style: 'position: absolute; left: 0; right: 0;'} Загрузить
+        .btn.btn-primary{style: 'position: absolute; left: 0; right: 0;'}= t('admin.common.upload')
         = file_field_tag :image, id: nil, data: {file: true, path: upload_uri,
           container: container, version: version, free_size: free_size},
           style: 'position: absolute; font-size: 100px; opacity: 0; cursor: pointer;'

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

@@ -9,7 +9,7 @@
     = title if defined? title
     .custom-file{style: "position: relative; display: inline-block; margin: 0 0 -9px 15px; width: 140px; height: 34px; overflow: hidden;"}
       .btn.btn-primary{style: "position: absolute; left: 0; right: 0;"}
-        Загрузить
+        = t('admin.common.upload')
       = file_field_tag "#{slider_type_prefix}_image[]", id: nil, multiple: multiple, data: {file: true, path: send("admin_upload_#{slider_class.to_s.underscore}_path", {slider_type: slider_type, master_object_id: object_id})},
         style:" position: absolute; font-size: 100px; opacity: 0; cursor: pointer;"
   .pictograms.row.sortable{data:{object:object_id, slider: slider_type}}

data/app/views/admin/home/dashboard.html.haml

@@ -1,5 +1,5 @@
 .page-header
-  %h1 Сводка
+  %h1= t('admin.common.dashboard')
 .row
   = render collection: @structure.sections, partial: 'structure/section'
 

data/app/views/admin/lookups/_form.html.haml

@@ -2,15 +2,9 @@
   = f.errors
   = flash_messages
 
-  = field_set lookup_name(@lookup.code) do
-    - if @lookup.type_code == 'string'
-      = f.string :value
-    - elsif @lookup.type_code == 'memo'
-      = f.textarea :value, rows: 5
-    - elsif @lookup.type_code == 'wysiwyg'
-      = f.ckeditor :value
+  = render "admin/lookups/types/#{@lookup.type_code}", f: f
 
   = fixed_actions do
     = f.save
-    = cancel_action admin_lookups_path
+    = cancel_action admin_lookups_index_path(category: @lookup.category)
 

data/app/views/admin/lookups/edit.html.haml

@@ -1,4 +1,4 @@
-%h1 Текст
+%h1= lookup_name(@lookup.code)
 .page-header
   %h3 Редактирование
 

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

@@ -1,6 +1,6 @@
-%h1 Тексты
+%h1= @category.present? ? t("lookups.category.#{@category}") : 'Тексты'
 
 = table_for(Lookup).content(@lookups) do |t|
   - t.column :code, cols: 4, format: lambda {|e| lookup_name(e)}
-  - t.column :value, cols: 7, format: lambda {|e| raw(truncate(strip_tags(e), length: 200)) }
+  - t.column :self, cols: 7, format: ->(lookup){ format_lookup(lookup) }, title: 'Значение'
   - t.action :edit

data/app/views/admin/lookups/types/_boolean.haml

@@ -0,0 +1 @@
+= f.checkbox :value, checked: @lookup.value == '1', data: tooltip_lookup_data(@lookup)

data/app/views/admin/lookups/types/_enum.haml

@@ -0,0 +1 @@
+= f.combobox :value, @lookup.select_options, data: tooltip_lookup_data(@lookup)

data/app/views/admin/lookups/types/_file.haml

@@ -0,0 +1,3 @@
+%p
+  = f.object.try(:tooltip)
+= f.file_upload :file

data/app/views/admin/lookups/types/_float.haml

@@ -0,0 +1 @@
+= f.string :value, div_class: 'col-md-2', data: tooltip_lookup_data(@lookup)

data/app/views/admin/lookups/types/_integer.haml

@@ -0,0 +1 @@
+= f.string :value, div_class: 'col-md-2', data: tooltip_lookup_data(@lookup)

data/app/views/admin/lookups/types/_memo.haml

@@ -0,0 +1 @@
+= f.textarea :value, rows: 5, data: tooltip_lookup_data(@lookup)

data/app/views/admin/lookups/types/_string.haml

@@ -0,0 +1 @@
+= f.string :value, data: tooltip_lookup_data(@lookup)

data/app/views/admin/lookups/types/_wysiwyg.haml

@@ -0,0 +1 @@
+= f.ckeditor :value, data: tooltip_lookup_data(@lookup)

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

@@ -0,0 +1,22 @@
+= twitter_form_for [:admin, @meta_tags], as: :site_meta_tags, url: url_for(action: :update, id: @meta_tags.id) do |f|
+  = f.errors
+  = flash_messages
+
+  = f.static_text :identifier_text
+
+  = f.string :site
+  = f.string  :title
+  = f.textarea :description, rows: 4
+  = f.image_upload :image, version: :main, size: '500x500', upload_path: admin_upload_image_path(image_class: :site_meta_tags, field: :image)
+  = f.string  :url
+
+  = field_set 'Open Graph' do
+    = f.string :og_title
+    = f.textarea :og_description, rows: 4
+    = f.image_upload :og_image, version: :main, size: '500x500', upload_path: admin_upload_image_path(image_class: :site_meta_tags, field: :og_image)
+    = f.string :og_url
+
+  = fixed_actions do
+    = f.save
+    = cancel_action admin_meta_tags_path
+

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

@@ -0,0 +1,5 @@
+%h Мета-тэги
+.page-header
+  %h3 Редактирование
+
+= render 'form'

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

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