optimacms 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5c71915c85fc8f8b2c3b927bc7fc5b7c44f91ac
-  data.tar.gz: 2ff1155e854f1b56f6407ec212bcf585c8128a6b
+  metadata.gz: 7423961f90b9cefc9804eba62c7a24a34ab07cb5
+  data.tar.gz: c5db0f9c93e7397db548504094fbd9d038a7c1a7
 SHA512:
-  metadata.gz: 86d108c522d1c97bd753052ae6e9988e17285d7f286385647dc233647e2a5ca6bbd15750252468647a32f572b831ce48ee4f0dc3c91b82406ef47402c33bd758
-  data.tar.gz: e3af7c37bd671c11116fe67c6b7e4abdf0c87dfa83c2e1c7ac2f154f02e415ce76b572b263e5244b36772fc5e6402427c4a220c373d2e97a802307c090a531c3
+  metadata.gz: ae063cca5a45779f75f469eb98c16fa9f443261b066c7797b8c588b7bc128ebda303d4006cc2f5a1c4b5e70d96f0fc68d3e3ab744250b56498f864eec260b184
+  data.tar.gz: 5b36846f5bd8ba734bd139184291708f0dda10bb16200a9eb41092ef379597a876a413d49ca22dbde5e62c7a57b83682780d971dbbb5e92230be2001583eed98

data/app/controllers/optimacms/admin/pages_controller.rb

@@ -138,7 +138,7 @@ module Optimacms
 
 
     # filter
-    include SimpleFilters::Controller
+    #include SimpleFilters::Controller
 
 
     def init_tabledata

data/app/helpers/optimacms/application_helper.rb

@@ -1,10 +1,12 @@
 module Optimacms
   module ApplicationHelper
 
+    include ActionView::Helpers::ApplicationHelper
+
     def method_missing(method, *args, &block)
-        main_app.send(method, *args, &block)
-      rescue NoMethodError
-        super
+      main_app.send(method, *args, &block)
+    rescue NoMethodError
+      super
     end
 
     def tinymce_editor_insert_block

data/app/views/optimacms/admin/pages/_form.html.haml

@@ -15,7 +15,7 @@
 
       = f.input :controller_action, as: :string, label: "Controller", :hint=>'controller#action. ex.: news#index'
 
-      = f.association :layout, label: "Layout", collection: @layouts
+      = f.association :layout, label: "Layout", collection: @layouts, label_method: :title
 
       .form-group.page_template
         %label(for="inputTemplate" class="col-sm-2 col-md-1 control-label")

data/lib/optimacms/filters/form_filter.rb

@@ -0,0 +1,224 @@
+module Optimacms
+  module Filters
+    class FormFilter
+
+      FIELD_TYPE_TEXT = 'text'
+      FIELD_TYPE_HIDDEN = 'hidden'
+      FIELD_TYPE_SELECT_AUTO = 'select_auto' # text with autocomplete
+
+      DBTYPE_STRING = 'string'
+      DBTYPE_INT = 'int'
+      DBTYPE_DATE = 'date'
+
+      #
+      attr_accessor :prefix # session prefix
+      attr_accessor :fields
+      attr_accessor :data
+      #attr_accessor :order # [ ["order_column", "asc|desc"], ..]
+
+
+
+      def initialize(_session, _prefix)
+        @prefix = _prefix
+        @session = _session
+
+        @fields ||={}
+
+        # init data
+        data()
+      end
+
+
+      ############
+      # fields
+      ############
+
+      def add_field(f)
+        @fields[f[:name]] = f
+
+      end
+
+      def add_fields_from_array(a)
+        a.each do |fa|
+          add_field fa
+        end
+
+      end
+
+
+      def field_def_value(name)
+        if (@fields.has_key? name) && (@fields[name].has_key? :def)
+          return @fields[name][:def]
+        end
+        nil
+      end
+
+      ############
+      # sessions
+      ############
+
+      def session_get(name, def_value)
+        @session[prefix+name] || def_value
+      end
+
+      def session_save(name, v)
+        @session[prefix+name] = v
+      end
+
+
+      ############
+      # data
+      ############
+
+
+      def data
+        return @data unless @data.nil?
+
+        # from session
+        @data_sess = session_get 'data', nil
+        unless @data_sess.nil?
+          @data = @data_sess
+        else
+
+        end
+
+        #
+        @data ||= {}
+
+        session_save('data', @data)
+
+        #
+        @data
+      end
+
+      def v(name, v_def=nil)
+        if (data.has_key? name) && (!data[name].nil?)
+          return data[name]
+        end
+
+        field_def_value(name) || v_def
+      end
+
+      def v_empty?(name)
+        if (data.has_key? name) && (!data[name].nil?)
+          return true
+        end
+
+        # if v == default value
+
+      end
+
+      def set(field_name,v)
+        data[field_name] = v
+      end
+
+
+      def clear_data
+        session_save 'data', {}
+      end
+
+      def set_data_from_form(params)
+        # search for fields like filter[XXX]
+        params.each do |name, v|
+          #if f =~ /^filter\[([^\]]+)\]$/
+            #name = Regexp.last_match(1)
+
+            next unless @fields.has_key? name
+
+            if @fields[name][:dbtype]==DBTYPE_INT
+              data[name] = (v.to_i rescue 0)
+            else
+              data[name] = v
+            end
+
+          #end
+        end
+
+        # default values from fields
+        @fields.each do |name, f|
+          next if @data.has_key? name
+
+          @data[name] = field_def_value name
+        end
+
+      end
+
+
+
+      ####
+      # order
+      ####
+
+      def order
+        return @order unless @order.nil?
+
+        # from session
+        @v_sess = session_get 'order', nil
+        @order = @v_sess unless @v_sess.nil?
+
+        #
+        @order ||= []
+
+        session_save 'order', @order
+
+        #
+        @order
+      end
+
+      def order= (value)
+        @order = value
+
+        session_save 'order', @order
+      end
+
+      def set_order_default(order_by, order_dir)
+        return false if !order.nil? && !order.empty?
+
+        set_order(order_by, order_dir)
+
+      end
+
+
+      def set_order(order_by, order_dir)
+        self.order = [[order_by, order_dir]]
+      end
+
+      def get_order
+        order[0] if order.count>0
+        order[0]
+      end
+
+
+      def get_opposite_order_dir_for_column(name)
+        return 'asc' if order.empty?
+
+
+        if order[0][0] == name
+          return opposite_order_dir(order[0][1])
+        end
+
+        return 'asc'
+      end
+
+      def opposite_order_dir(order_dir)
+        return 'asc' if order_dir=='desc'
+        return 'desc' if order_dir=='asc'
+        'asc'
+      end
+
+
+
+      #helper methods
+
+      def html_style(name)
+        return '' unless @fields[name].has_key?(:opt)
+
+        s = ''
+        opt = @fields[name][:opt]
+        unless opt[:width].nil?
+          s << "width: #{opt[:width]}px; "
+        end
+      end
+    end
+  end
+end

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,3 @@
 module ApplicationHelper
+  include FontAwesome::Rails::IconHelper
 end

data/test/dummy/app/views/my/hello.html.haml

@@ -2,4 +2,4 @@ Hello - this is APP
 
 home
 
-=home_path
+=fa_icon 'folder-o'

data/test/dummy/app/views/pages/about.html.erb

@@ -1,3 +1,7 @@
 1
 2
-3
+3
+About
+<%=fa_icon "folder-o" %>
+
+111