optimacms 0.1.54 → 0.1.55

data/app/helpers/optimacms/forms_helper.rb

@@ -1,75 +1,75 @@
-module Optimacms
-  module FormsHelper
-    def horizontal_simple_form_for(resource, options = {}, &block)
-      options[:html] ||= {}
-
-      # class
-      options[:html][:class] ||= []
-      if options[:html][:class].is_a? Array
-        options[:html][:class] << 'form-horizontal'
-      else
-        options[:html][:class] << ' form-horizontal'
-      end
-      options[:html][:role] = 'form'
-
-
-      options[:wrapper] = :horizontal_form
-      options[:wrapper_mappings] = {check_boxes: :horizontal_radio_and_checkboxes, radio_buttons: :horizontal_radio_and_checkboxes, file: :horizontal_file_input,boolean: :horizontal_boolean      }
-      simple_form_for(resource, options, &block)
-    end
-
-
-
-    def inline_simple_search_form_for(filter_object, options = {}, &block)
-      return render 'tableview/filter.html.haml', style: :inline, filter_object: filter_object
-      return
-
-      options[:html] ||= {}
-
-      options[:url] = send(filter_object.url)
-
-      options[:html][:role] = 'form'
-
-      # class
-      options[:html][:class] ||= []
-      if options[:html][:class].is_a? String
-        options[:html][:class] = [options[:html][:class]]
-      end
-      options[:html][:class] << 'form-inline'
-      options[:html][:id] = 'formFilter'
-
-      options[:wrapper] = :inline_search_form
-      options[:wrapper_mappings] = {      }
-
-
-      capture do
-        simple_form_for(:filter, options) do |f|
-          concat(hidden_field_tag 'cmd', 'apply')
-          concat(render 'tableview/filter_fields', filter: filter_object, f: f)
-          concat(render 'tableview/buttons_apply_clear_inline', filter: filter_object, f: f)
-        end
-      end
-
-    end
-
-
-    def horizontal_simple_search_form_for(filter_object, options = {}, &block)
-      return render 'tableview/filter.html.haml', style: :horizontal, filter_object: filter_object
-    end
-
-=begin
-    def link_to_sortable_column(field_name, title = nil, html_options = nil, &block)
-      html_options ||= {}
-
-      if @filter.search_method_post_and_redirect?
-        html_options[:method] = :post
-      end
-
-      url = send(@filter.url, @filter.url_params_for_sortable_column(field_name))
-
-      link_to(title, url, html_options)
-    end
-=end
-
-  end
-end
+module Optimacms
+  module FormsHelper
+    def horizontal_simple_form_for(resource, options = {}, &block)
+      options[:html] ||= {}
+
+      # class
+      options[:html][:class] ||= []
+      if options[:html][:class].is_a? Array
+        options[:html][:class] << 'form-horizontal'
+      else
+        options[:html][:class] << ' form-horizontal'
+      end
+      options[:html][:role] = 'form'
+
+
+      options[:wrapper] = :horizontal_form
+      options[:wrapper_mappings] = {check_boxes: :horizontal_radio_and_checkboxes, radio_buttons: :horizontal_radio_and_checkboxes, file: :horizontal_file_input,boolean: :horizontal_boolean      }
+      simple_form_for(resource, options, &block)
+    end
+
+
+
+    def inline_simple_search_form_for(filter_object, options = {}, &block)
+      return render 'tableview/filter.html.haml', style: :inline, filter_object: filter_object
+      return
+
+      options[:html] ||= {}
+
+      options[:url] = send(filter_object.url)
+
+      options[:html][:role] = 'form'
+
+      # class
+      options[:html][:class] ||= []
+      if options[:html][:class].is_a? String
+        options[:html][:class] = [options[:html][:class]]
+      end
+      options[:html][:class] << 'form-inline'
+      options[:html][:id] = 'formFilter'
+
+      options[:wrapper] = :inline_search_form
+      options[:wrapper_mappings] = {      }
+
+
+      capture do
+        simple_form_for(:filter, options) do |f|
+          concat(hidden_field_tag 'cmd', 'apply')
+          concat(render 'tableview/filter_fields', filter: filter_object, f: f)
+          concat(render 'tableview/buttons_apply_clear_inline', filter: filter_object, f: f)
+        end
+      end
+
+    end
+
+
+    def horizontal_simple_search_form_for(filter_object, options = {}, &block)
+      return render 'tableview/filter.html.haml', style: :horizontal, filter_object: filter_object
+    end
+
+=begin
+    def link_to_sortable_column(field_name, title = nil, html_options = nil, &block)
+      html_options ||= {}
+
+      if @filter.search_method_post_and_redirect?
+        html_options[:method] = :post
+      end
+
+      url = send(@filter.url, @filter.url_params_for_sortable_column(field_name))
+
+      link_to(title, url, html_options)
+    end
+=end
+
+  end
+end

data/app/inputs/textarea_tinymce_input.rb

@@ -1,28 +1,28 @@
-
-class TextareaTinymceInput < SimpleForm::Inputs::Base
-
-  def input(wrapper_options = nil)
-    out = ActiveSupport::SafeBuffer.new
-
-     # prepare options
-    new_html_options = prepare_html_options(wrapper_options)
-
-
-    #input_html_classes.unshift(" currency")
-    #input_html_options[:type] ||= input_type if html5?
-
-    #template.content_tag(:span, "$", class: "add-on") +
-    #@builder.text_field(attribute_name, input_html_options)
-
-    out << @builder.text_area(attribute_name, new_html_options)
-    out
-  end
-
-  def prepare_html_options(wrapper_options=nil)
-   new_options = {}
-   new_options[:class] = [input_html_options[:class], options[:class], 'tinymce'].compact
-
-   merge_wrapper_options(input_html_options.merge(new_options), wrapper_options)
- end
-
+
+class TextareaTinymceInput < SimpleForm::Inputs::Base
+
+  def input(wrapper_options = nil)
+    out = ActiveSupport::SafeBuffer.new
+
+     # prepare options
+    new_html_options = prepare_html_options(wrapper_options)
+
+
+    #input_html_classes.unshift(" currency")
+    #input_html_options[:type] ||= input_type if html5?
+
+    #template.content_tag(:span, "$", class: "add-on") +
+    #@builder.text_field(attribute_name, input_html_options)
+
+    out << @builder.text_area(attribute_name, new_html_options)
+    out
+  end
+
+  def prepare_html_options(wrapper_options=nil)
+   new_options = {}
+   new_options[:class] = [input_html_options[:class], options[:class], 'tinymce'].compact
+
+   merge_wrapper_options(input_html_options.merge(new_options), wrapper_options)
+ end
+
 end

data/app/models/concerns/optimacms/meta_content.rb

@@ -1,63 +1,63 @@
-module Optimacms
-
-module MetaContent
-  extend ActiveSupport::Concern
-
-  included do
-    #has_many :taggings, as: :taggable
-
-    #class_attribute :tag_limit
-
-
-  end
-
-
-
-
-  def meta_keywords_content(lang='')
-  end
-
-  def meta_keywords_content=(v, lang='')
-  end
-
-
-
-  # methods defined here are going to extend the class, not the instance of it
-  module ClassMethods
-
-    def make_meta(langs)
-      langs.each do |lang|
-        define_method("meta_keywords_#{lang}") do
-          #puts "@#{name} was set to #{val}"
-          #instance_variable_set("@#{name}", val)
-          x=0
-        end
-      end
-    end
-
-    def method_missing(method_sym, *arguments, &block)
-      if method_sym.to_s =~ /^meta_(.*)_(.*)$/
-        t, lang = $1, $2
-        #find($1.to_sym => arguments.first)
-        #self.x=0
-      else
-        super
-      end
-    end
-
-
-    # settings
-
-    def dir_meta
-
-    end
-
-    def tag_limit(value)
-      self.tag_limit_value = value
-    end
-
-
-  end
-
-end
-end
+module Optimacms
+
+module MetaContent
+  extend ActiveSupport::Concern
+
+  included do
+    #has_many :taggings, as: :taggable
+
+    #class_attribute :tag_limit
+
+
+  end
+
+
+
+
+  def meta_keywords_content(lang='')
+  end
+
+  def meta_keywords_content=(v, lang='')
+  end
+
+
+
+  # methods defined here are going to extend the class, not the instance of it
+  module ClassMethods
+
+    def make_meta(langs)
+      langs.each do |lang|
+        define_method("meta_keywords_#{lang}") do
+          #puts "@#{name} was set to #{val}"
+          #instance_variable_set("@#{name}", val)
+          x=0
+        end
+      end
+    end
+
+    def method_missing(method_sym, *arguments, &block)
+      if method_sym.to_s =~ /^meta_(.*)_(.*)$/
+        t, lang = $1, $2
+        #find($1.to_sym => arguments.first)
+        #self.x=0
+      else
+        super
+      end
+    end
+
+
+    # settings
+
+    def dir_meta
+
+    end
+
+    def tag_limit(value)
+      self.tag_limit_value = value
+    end
+
+
+  end
+
+end
+end

data/app/models/optimacms/language.rb

@@ -1,14 +1,14 @@
-module Optimacms
-  class Language < ActiveRecord::Base
-    self.table_name = 'cms_languages'
-
-
-    scope :admin_enabled, -> {order('pos asc')}
-
-    def self.list_with_default
-      rows = ['']+Language.admin_enabled.all.map(&:lang)
-
-    end
-
-  end
-end
+module Optimacms
+  class Language < ActiveRecord::Base
+    self.table_name = 'cms_languages'
+
+
+    scope :admin_enabled, -> {order('pos asc')}
+
+    def self.list_with_default
+      rows = ['']+Language.admin_enabled.all.map(&:lang)
+
+    end
+
+  end
+end

data/app/models/optimacms/layout.rb

@@ -1,53 +1,53 @@
-module Optimacms
-
-  class Layout < ActiveRecord::Base
-    self.table_name = 'cms_templates'
-
-    has_many :pages
-
-    # scopes
-    scope :main, -> { where(tpl_type: 'main')}
-
-    # content
-
-    def content(lang='')
-      filename =  content_filename_full(lang)
-      if !File.exists? filename
-        return ''
-      end
-      File.read(filename)
-    end
-
-    def content=(v, lang='')
-      File.open(content_filename_full(lang), "w+") do |f|
-        f.write(v)
-      end
-    end
-
-    def content_filename_full(lang)
-      Layout.content_filename_dir + content_filename(lang)
-    end
-
-    def content_filename(lang='')
-      self.name+content_filename_lang_postfix(lang)+'.'+content_filename_ext
-    end
-
-
-    def self.content_filename_dir
-      #Rails.root.to_s + '/content/layouts/'
-      Rails.root.to_s + '/app/views/layouts/'
-    end
-
-    def content_filename_lang_postfix(lang)
-      return '' if lang==''
-      return '.'+lang
-    end
-
-    def content_filename_ext
-      return 'html.erb'
-    end
-
-
-  end
-end
-
+module Optimacms
+
+  class Layout < ActiveRecord::Base
+    self.table_name = 'cms_templates'
+
+    has_many :pages
+
+    # scopes
+    scope :main, -> { where(tpl_type: 'main')}
+
+    # content
+
+    def content(lang='')
+      filename =  content_filename_full(lang)
+      if !File.exists? filename
+        return ''
+      end
+      File.read(filename)
+    end
+
+    def content=(v, lang='')
+      File.open(content_filename_full(lang), "w+") do |f|
+        f.write(v)
+      end
+    end
+
+    def content_filename_full(lang)
+      Layout.content_filename_dir + content_filename(lang)
+    end
+
+    def content_filename(lang='')
+      self.name+content_filename_lang_postfix(lang)+'.'+content_filename_ext
+    end
+
+
+    def self.content_filename_dir
+      #Rails.root.to_s + '/content/layouts/'
+      Rails.root.to_s + '/app/views/layouts/'
+    end
+
+    def content_filename_lang_postfix(lang)
+      return '' if lang==''
+      return '.'+lang
+    end
+
+    def content_filename_ext
+      return 'html.erb'
+    end
+
+
+  end
+end
+

data/app/models/optimacms/mediafile.rb

@@ -1,17 +1,17 @@
-module Optimacms
-
-  class Mediafile < ActiveRecord::Base
-    self.table_name = 'cms_mediafiles'
-
-    has_attached_file :photo,
-                      :styles => { :large=>'800x600>', :medium => "200x150#", :thumb => "150x112#" },
-                      :default_url => "/icons/:style/noimage.png",
-                      :path => ":rails_root/public/uploads/images/:basename_:style.:extension",
-                      :url => "/uploads/images/:basename_:style.:extension"
-    # /:class/:attachment
-    validates_attachment_content_type :photo, :content_type => /\Aimage\/.*\Z/
-
-  end
-
-end
-
+module Optimacms
+
+  class Mediafile < ActiveRecord::Base
+    self.table_name = 'cms_mediafiles'
+
+    has_attached_file :photo,
+                      :styles => { :large=>'800x600>', :medium => "200x150#", :thumb => "150x112#" },
+                      :default_url => "/icons/:style/noimage.png",
+                      :path => ":rails_root/public/uploads/images/:basename_:style.:extension",
+                      :url => "/uploads/images/:basename_:style.:extension"
+    # /:class/:attachment
+    validates_attachment_content_type :photo, :content_type => /\Aimage\/.*\Z/
+
+  end
+
+end
+