optimacms 0.1.55 → 0.1.56

data/app/controllers/optimacms/tinymce_assets_controller.rb

@@ -1,21 +1,21 @@
-class Optimacms::TinymceAssetsController < ApplicationController
-
-  def create
-    # Take upload from params[:file] and store it somehow...
-    # Optionally also accept params[:hint] and consume if needed
-
-    #params.require(:photo).permit(:title, :description, :photo)
-    #@item = model.build item_params
-
-    item = Optimacms::Mediafile.new(:photo=>params[:file])
-    res = item.save
-
-
-    render json: {
-      image: {
-        #url: view_context.image_url(item.photo_url)
-        url: item.photo.url
-      }
-    }, content_type: "text/html"
-  end
+class Optimacms::TinymceAssetsController < ApplicationController
+
+  def create
+    # Take upload from params[:file] and store it somehow...
+    # Optionally also accept params[:hint] and consume if needed
+
+    #params.require(:photo).permit(:title, :description, :photo)
+    #@item = model.build item_params
+
+    item = Optimacms::Mediafile.new(:photo=>params[:file])
+    res = item.save
+
+
+    render json: {
+      image: {
+        #url: view_context.image_url(item.photo_url)
+        url: item.photo.url
+      }
+    }, content_type: "text/html"
+  end
 end

data/app/helpers/optimacms/application_helper.rb

@@ -1,106 +1,111 @@
-module Optimacms
-  module ApplicationHelper
-
-    #include ActionView::Helpers::ApplicationHelper
-    #include SimpleFilter::FormsHelper
-
-
-    def method_missing(method, *args, &block)
-      main_app.send(method, *args, &block)
-    rescue NoMethodError
-      super
-    end
-
-    def tinymce_editor_insert_block
-      '<pre>{{block:name:sub}}</pre>'
-    end
-
-    def eval_meta_string(s)
-      eval('"'+s+'"')
-    end
-
-    def fix_quotes(s)
-      s.gsub /"/, '\"'
-    end
-
-    def url_for(options = nil)
-      # page processed by CMS
-      if options.present? && options.kind_of?(Hash) && options[:controller]=='optimacms/pages' && options[:action]=='show'
-
-        # get current page name
-        page_name = options[:page_name] || controller.optimacms_pagedata.page.name
-        if page_name.present?
-          return site_page_path(page_name, options)
-        end
-      end
-
-      #
-      return super(options)
-    end
-
-
-
-    def meta_tags(title=nil, keywords=nil, desc=nil)
-      #s = 'news "11"'
-      #s1 = s.gsub /"/, '\"'
-      #s2 = eval('"'+s1+'"')
-      title ||= eval_meta_string(fix_quotes(@optimacms_meta_title))
-      keywords ||= eval_meta_string(@optimacms_meta_keywords)
-      desc ||= eval_meta_string(@optimacms_meta_description)
-
-
-    return %(<title>#{title}</title>
-<meta name="keywords" content="#{keywords}"/>
-<meta name="description" content="#{desc}"/>
-      ).html_safe
-      #content_tag(:title, title)+
-      #content_tag(:meta, nil, content: keywords, name: 'keywords')+
-      #content_tag(:meta, nil, content: desc, name: 'description')
-    end
-
-    def block(name)
-      x = Dir.pwd
-      #y = File.expand_path File.dirname(__FILE__)
-      d = File.dirname(@optimacms_tpl)
-
-      # extensions
-      extensions = ['', '.html.haml', '.html.erb', '.html']
-
-
-      # try. HTML file in the current folder
-      f = File.join(Dir.pwd, 'app', 'views', d, name+'.html')
-      return render file: f if File.exists? f
-
-      #
-      names = []
-
-      #
-      parts = name.split /\//
-
-      parts[-1] = '_'+parts[-1]
-      name2 = parts.join('/')
-
-      #
-      names << [d, name]
-      names << ["", name]
-
-      names << [d, name2]
-      names << ["", name2]
-
-
-      # try 2
-      names.each do |p|
-        extensions.each do |ext|
-          f = File.join(Dir.pwd, 'app', 'views', p[0], p[1]+ext)
-          (return render file: f)      if File.exists? f
-        end
-      end
-
-      # default render
-      return render name
-    end
-    
-
-    
-  end
-end
+module Optimacms
+  module ApplicationHelper
+
+    #include ActionView::Helpers::ApplicationHelper
+    #include SimpleFilter::FormsHelper
+
+
+    def method_missing(method, *args, &block)
+      main_app.send(method, *args, &block)
+    rescue NoMethodError
+      super
+    end
+
+    def tinymce_editor_insert_block
+      '<pre>{{block:name:sub}}</pre>'
+    end
+
+    def eval_meta_string(s)
+      eval('"'+s+'"')
+    end
+
+    def fix_quotes(s)
+      s.gsub /"/, '\"'
+    end
+
+    def url_for(options = nil)
+      #url_for
+      # page processed by CMS
+      if options.present? && options.kind_of?(Hash) && options[:controller]=='optimacms/pages' && options[:action]=='show'
+
+        # get current page name
+        page_name = options[:page_name] || controller.optimacms_pagedata.page.name
+        if page_name.present?
+          u = site_page_path(page_name, options)
+
+          if u.present?
+            return u
+          end
+        end
+      end
+
+      #
+      return super(options)
+    end
+
+
+
+    def meta_tags(title=nil, keywords=nil, desc=nil)
+      #s = 'news "11"'
+      #s1 = s.gsub /"/, '\"'
+      #s2 = eval('"'+s1+'"')
+      title ||= eval_meta_string(fix_quotes(@optimacms_meta_title))
+      keywords ||= eval_meta_string(@optimacms_meta_keywords)
+      desc ||= eval_meta_string(@optimacms_meta_description)
+
+
+    return %(<title>#{title}</title>
+<meta name="keywords" content="#{keywords}"/>
+<meta name="description" content="#{desc}"/>
+      ).html_safe
+      #content_tag(:title, title)+
+      #content_tag(:meta, nil, content: keywords, name: 'keywords')+
+      #content_tag(:meta, nil, content: desc, name: 'description')
+    end
+
+    def block(name)
+      x = Dir.pwd
+      #y = File.expand_path File.dirname(__FILE__)
+      d = File.dirname(@optimacms_tpl)
+
+      # extensions
+      extensions = ['', '.html.haml', '.html.erb', '.html']
+
+
+      # try. HTML file in the current folder
+      f = File.join(Dir.pwd, 'app', 'views', d, name+'.html')
+      return render file: f if File.exists? f
+
+      #
+      names = []
+
+      #
+      parts = name.split /\//
+
+      parts[-1] = '_'+parts[-1]
+      name2 = parts.join('/')
+
+      #
+      names << [d, name]
+      names << ["", name]
+
+      names << [d, name2]
+      names << ["", name2]
+
+
+      # try 2
+      names.each do |p|
+        extensions.each do |ext|
+          f = File.join(Dir.pwd, 'app', 'views', p[0], p[1]+ext)
+          (return render file: f)      if File.exists? f
+        end
+      end
+
+      # default render
+      return render name
+    end
+    
+
+    
+  end
+end

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