zena 1.2.1 → 1.2.2

data/lib/zena/use/calendar.rb

@@ -51,7 +51,7 @@ module Zena
         end
 
         # Get day class. The first parameter is an UTC Date. The second is a local Time.
-        def cal_class(utc_date, local_ref, tz)
+        def cal_class(utc_date, local_ref, tz, events=nil)
           date = tz.utc_to_local(utc_date.to_time)
           @cal_today ||= tz.utc_to_local(Time.now).strftime(DAY_FORMAT)
           case date.wday
@@ -64,9 +64,10 @@ module Zena
           end
           s +=  'other' if date.mon != local_ref.mon
           s = s == '' ? [] : [s]
-          s <<  'today' if date.strftime(DAY_FORMAT) == @today
+          s <<  'today' if date.strftime(DAY_FORMAT) == @cal_today
           s <<  'ref'   if date.strftime(DAY_FORMAT) == local_ref.strftime(DAY_FORMAT)
-          s == [] ? '' : " class='#{s.join(' ')}'"
+          s <<  'events' if events
+          s.join(' ')
         end
 
         # Yield block for every week between 'start_date' and 'end_date' with a hash of days => events.
@@ -197,16 +198,16 @@ module Zena
             if header_block = descendant('header')
             elsif @params[:type] == 'week'
               add_block(%q{<h3 do='header'>
-                <r:link date='date.advance(:days =&gt; -1)' t='img_prev_page'/>
+                <r:link date='date.advance(:days => -1)' t='img_prev_page'/>
                 <r:date format='%B'/>
-                <r:link date='date.advance(:days =&gt; 1)' t='img_next_page'/>
+                <r:link date='date.advance(:days => 1)' t='img_next_page'/>
               </h3>}, true)
               header_block = descendant('header')
             else
               add_block(%q{<h3 do='header'>
-                <r:link date='date.advance(:months =&gt; -1)' t='img_prev_page'/>
+                <r:link date='date.advance(:months => -1)' t='img_prev_page'/>
                 <r:date format='%B'/>
-                <r:link date='date.advance(:months =&gt; 1)' t='img_next_page'/>
+                <r:link date='date.advance(:months => 1)' t='img_next_page'/>
               </h3>}, true)
               header_block = descendant('header')
             end
@@ -231,7 +232,7 @@ module Zena
             opts[:current_date] = get_var_name('calendar', 'c_date')
             make_calendar(opts)
           end
-
+          
           def make_calendar(opts)
             current_date = opts[:current_date]
             type = params[:type] ? params[:type].to_sym : :month
@@ -257,9 +258,10 @@ module Zena
               set_tz = "<% #{tz_var} = visitor.tz %>"
             end
 
-            cell_date = get_var_name('calendar', 'date')
-            cal_start = get_var_name('calendar', 'cal_start')
-            cal_end   = get_var_name('calendar', 'cal_end')
+            cell_date  = get_var_name('calendar', 'date')
+            cal_start  = get_var_name('calendar', 'cal_start')
+            cal_end    = get_var_name('calendar', 'cal_end')
+            day_class  = get_var_name('calendar', 'class')
 
             # To avoid wrapping in each cell
             markup = @markup
@@ -305,15 +307,16 @@ module Zena
               klass = finder[:query].main_class
               return parser_error("invalid class (#{klass})") unless klass.ancestors.include?(Node)
 
-              if type = klass.safe_method_type([date_attr])
-                if type[:class] <= Time
+              if safe_type = klass.safe_method_type([date_attr])
+                if safe_type[:class] <= Time
                   # OK
                 else
-                  return parser_error("Invalid attribute '#{date_attr}': type is '#{type[:class]}' should be Time")
+                  return parser_error("Invalid attribute '#{date_attr}': '#{safe_type[:class]}' is not a Time")
                 end
               else
                 return parser_error("Invalid attribute '#{date_attr}' for #{klass}")
               end
+              
               # HACK to overwrite 'header' method...
               h = opts[:header]
               h.method = 'void'
@@ -325,6 +328,12 @@ module Zena
                 cell_date,
                 :class => Time
               ))
+              
+              # Date for the cell
+              set_context_var('set_var', 'day_class', RubyLess::TypedString.new(
+                day_class,
+                :class => String
+              ))
 
 
               # HACK to render sub-elements...
@@ -333,7 +342,18 @@ module Zena
                 # reset saved scope
                 @context[:saved_template] = nil
                 @blocks = opts[:cell].blocks
-                cell_code   = expand_if(var, node.move_to(var, [klass]))
+                
+                cell_code = expand_if(var, node.move_to(var, [klass]))
+                unless @params[:split_hours]
+                  markup = opts[:cell].markup
+                  markup.tag = 'td'
+
+                  markup.params[:class] ||= '#{day_class}'
+                  markup.compile_params(self)
+                  markup.done = false
+                  cell_code = markup.wrap(cell_code)
+                end
+                
                 @context[:saved_template] = saved_template
               @blocks = bak
             @markup = markup
@@ -360,13 +380,13 @@ module Zena
               hour_var = get_var_name('calendar', 'hour')
 
               week_code = "<% #{week_var}.step(#{week_var}+6,1) do |#{day_var}| %>
-              <td<%= cal_class(#{day_var},#{local_ref}, #{tz_var}) %>>#{opts[:cell_prefix_code]}<% #{hours.inspect}.each do |#{hour_var}|; #{cell_date} = #{day_var}.to_time.advance(:hours => #{hour_var}); #{var} = #{events_hash}[#{cell_date}).strftime_tz('%Y-%m-%d %H',#{tz_var})] %>#{cell_code}<% end %>#{opts[:cell_postfix_code]}</td>
+              <td class='<%= cal_class(#{day_var},#{local_ref},#{tz_var}) %>'><% #{hours.inspect}.each do |#{hour_var}|; #{cell_date} = #{day_var}.to_time.advance(:hours => #{hour_var}); #{var} = #{events_hash}[#{cell_date}).strftime_tz('%Y-%m-%d %H',#{tz_var})] %>#{cell_code}<% end %></td>
               <% end %>"
               (@context[:vars] ||= []) << "hour"
             else
               hours = nil
               week_code = "<% #{week_var}.step(#{week_var}+6,1) do |#{day_var}| %>
-              <td<%= cal_class(#{day_var},#{local_ref}, #{tz_var}) %>><% #{cell_date} = #{day_var}.to_time; #{var} = #{events_hash}[#{cell_date}.strftime_tz('%Y-%m-%d 00',#{tz_var})] %>#{opts[:cell_prefix_code]}#{cell_code}#{opts[:cell_postfix_code]}</td>
+              <% #{cell_date} = #{day_var}.to_time; #{var} = #{events_hash}[#{cell_date}.strftime_tz('%Y-%m-%d 00',#{tz_var})]; #{day_class} = cal_class(#{day_var},#{local_ref},#{tz_var},#{var}) %>#{cell_code}
               <% end %>"
             end
 

data/lib/zena/use/conditional.rb

@@ -10,7 +10,7 @@ module Zena::Use::Conditional
       return parser_error("Cannot scope class in list (use each before filtering).") if node.list_context?
       # capital letter ==> class conditional
       if klass = VirtualClass[class_name]
-        if klass.kpath =~ %r{^#{node.klass.kpath}} || @context[:saved_template]
+        if node.klass.kpath =~ %r{^#{klass.kpath}} || klass.kpath =~ %r{^#{node.klass.kpath}} || @context[:saved_template]
           # Saved templates can be rendered with anything...
           # FIXME: Make sure saved templates from 'block' start with the proper node type ?
           cond     = "#{node}.kpath_match?('#{klass.kpath}')"
@@ -21,7 +21,7 @@ module Zena::Use::Conditional
           new_node = node.move_to(node.name, klass)
         end
       elsif role = Node.get_role(class_name)
-        if node.klass.kpath =~ %r{^#{role.kpath}} || @context[:saved_template]
+        if node.klass.kpath =~ %r{^#{role.kpath}} || role.kpath =~ %r{^#{node.klass.kpath}} || @context[:saved_template]
           # Saved templates can be rendered with anything...
           # FIXME: Make sure saved templates from 'block' start with the proper node type ?
           cond     = "#{node}.has_role?(#{role.id})"

data/lib/zena/use/context.rb

@@ -189,16 +189,29 @@ module Zena
             var = var.to_s
             begin
               typed_string = ::RubyLess.translate(self, code)
-              name = get_var_name('set_var', var)
-              out "<% #{name} = #{typed_string} %>"
-              var_setting = {}
-              set_context_var('set_var', var, RubyLess::TypedString.new(name, typed_string.opts), var_setting)
-              # Leak into following siblings
-              self.pass(var_setting)
-              # Set inside
-              @context.merge!(var_setting)
+              
+              # Do we have this variable already ?
+              if up_var = get_context_var('set_var', var)
+                if up_var.klass != typed_string.klass
+                  return parser_error("Type mismatch for var #{var}=#{code}: #{typed_string.klass} != #{up_var.klass}")
+                end
+                
+                if typed_string.could_be_nil?
+                  if !up_var.could_be_nil?
+                    out "<% #{up_var} = #{typed_string} || #{up_var} %>"
+                  else
+                    out "<% #{up_var} = #{typed_string} %>"
+                  end
+                else  
+                  out "<% #{up_var} = #{typed_string} %>"
+                end
+              else
+                name = get_var_name('set_var', var)
+                out "<% #{name} = #{typed_string} %>"
+                set_context_var('set_var', var, RubyLess::TypedString.new(name, typed_string.opts))
+              end
             rescue RubyLess::NoMethodError => err
-              parser_error(err.message, code)
+              out parser_error(err.message, "set #{var}=#{code}")
             end
           end
           expand_with
@@ -255,6 +268,14 @@ module Zena
         def r_each_group
           r_each
         end
+        
+        def r_master_template
+          if template = @context[:master_template]
+            expand_if("#{var} = secure(Node) { Node.find_by_zip(#{template.zip}) }", node.move_to(var, template.vclass))
+          else
+            out ''
+          end
+        end
       end # ZafuMethods
     end # Context
   end # Use

data/lib/zena/use/dates.rb

@@ -134,9 +134,9 @@ module Zena
       	  # fld = Zafu::Markup.new('input')
       	  # fld.params = (opts[:html] || {}).merge(:name => "node[#{name}]", :id => opts[:id], :type => 'text', :value => value)
       	  if opts[:size]
-            fld = "<input id='#{opts[:id]}' name='node[#{name}]' type='text' size='#{opts[:size]}' value='#{value}' class='#{opts[:class]}'/>"
+            fld = "<input id='#{opts[:id]}' name='#{name}' type='text' size='#{opts[:size]}' value='#{value}' class='#{opts[:class]}'/>"
           else
-            fld = "<input id='#{opts[:id]}' name='node[#{name}]' type='text' value='#{value}' class='#{opts[:class]}'/>"
+            fld = "<input id='#{opts[:id]}' name='#{name}' type='text' value='#{value}' class='#{opts[:class]}'/>"
           end
 
           js_data << %Q{Calendar.setup({
@@ -153,6 +153,10 @@ module Zena
       		EOL
       	end
       end
+      
+      module ModelMethods
+        include Common
+      end
 
       module ViewMethods
         include Common
@@ -306,6 +310,32 @@ module Zena
         rescue TZInfo::AmbiguousTime
           0
         end
+        
+        def advance_tz(opts, tz = nil)
+          if tz.blank?
+            tz = visitor.tz
+          elsif tz.kind_of?(String)
+            tz = TZInfo::Timezone.get(tz)
+          end
+          tz.local_to_utc(tz.utc_to_local(self).advance(opts))
+        rescue TZInfo::InvalidTimezoneIdentifier
+          self
+        rescue TZInfo::AmbiguousTime
+          self
+        end
+        
+        def wday_tz(tz = nil)
+          if tz.blank?
+            tz = visitor.tz
+          elsif tz.kind_of?(String)
+            tz = TZInfo::Timezone.get(tz)
+          end
+          tz.utc_to_local(self).wday
+        rescue TZInfo::InvalidTimezoneIdentifier
+          0
+        rescue TZInfo::AmbiguousTime
+          0
+        end
 
         def to_date_tz(tz = nil)
           if tz.blank?
@@ -330,11 +360,17 @@ module Zena
           :days    => Number,
           :hours   => Number,
           :minutes => Number,
-          :seconds => Number}] => Time
+          :seconds => Number}] => {:class => Time, :pre_processor => true, :method => 'advance_tz'}
+          
         safe_method_for Time, :to_i    => {:class => Number, :pre_processor => true}
         safe_method_for Time, :year                      => {:class => Number, :pre_processor => true, :method => 'year_tz'}
         safe_method_for Time, [:year, String]            => {:class => Number, :pre_processor => true, :method => 'year_tz'}
         safe_method_for Time, [:year, TZInfo::Timezone]  => {:class => Number, :pre_processor => true, :method => 'year_tz'}
+        
+        safe_method_for Time, :wday                      => {:class => Number, :pre_processor => true, :method => 'wday_tz'}
+        safe_method_for Time, [:wday, String]            => {:class => Number, :pre_processor => true, :method => 'wday_tz'}
+        safe_method_for Time, [:wday, TZInfo::Timezone]  => {:class => Number, :pre_processor => true, :method => 'wday_tz'}
+        
         safe_method_for Time, [:strftime, String]                   => {:class => String, :pre_processor => true, :method => 'strftime_tz'}
         safe_method_for Time, [:strftime, String, String]           => {:class => String, :pre_processor => true, :method => 'strftime_tz'}
         safe_method_for Time, [:strftime, String, TZInfo::Timezone] => {:class => String, :pre_processor => true, :method => 'strftime_tz'}

data/lib/zena/use/display.rb

@@ -4,11 +4,10 @@ module Zena
       module Common
         def icon_finder
           if rel = RelationProxy.find_by_role('icon')
-            finder = 'icon or image'
+            "icon or image group by id,l_id order by l_id desc, position asc"
           else
-            finder = 'image'
+            "image order by position asc"
           end
-          "#{finder} group by id,l_id order by l_id desc, position asc"
         end
       end # Common
 
@@ -442,7 +441,7 @@ module Zena
             node = node(Node) || '@node'
             return nil unless attribute = get_attribute_or_eval
 
-            hash_arguments = extract_from_params(:code, :host, :line_numbers, :theme) || []
+            hash_arguments = extract_from_params(:code, :host, :line_numbers, :theme, :target) || []
 
             hash_arguments.insert(0, ":node => #{node}")
 
@@ -489,6 +488,7 @@ module Zena
         end
 
         def extract_label(res, attribute)
+          attribute ||= @params[:param]
           if (label = param(:label) || param(:tlabel)) && attribute
             case label
             when 'true'
@@ -602,7 +602,7 @@ module Zena
 
           params = {}
           @params.each do |k,v|
-            next if [:attr, :eval, :text, :t, :update].include?(k)
+            next if [:attr, :eval, :text, :t].include?(k)
             v = RubyLess.translate_string(self, v)
             if v.literal
               params[k] = CGI.escape(v.literal)
@@ -611,21 +611,8 @@ module Zena
             end
           end
           
-          if upd = @params[:update]
-            js = ""
-            with_context(:node => node(Node)) do
-              href = make_href(upd)
-              name = get_var_name('add_document', 'update')
-
-              txt = "%Q{#{name}\#{#{node}.zip} = function() {new Ajax.Request(\"\#{#{href}}\", {asynchronous:true, evalScripts:true, method:\"get\"})}}"
-              js = "<% js_data << #{txt} %>"
-              # Evaluated before the add_document page is opened.
-              params[:js] = "<%= CGI.escape(\"Zena.t().#{name}\#{#{node}.zip}();\") %>"
-            end
-          end
-          
           res = node_action_link('add_doc', "<%= #{node}.zip %>", :text => text_for_link(''), :params => params)
-          "<% if #{node}.can_write? %>#{js}#{wrap(res)}<% end %>"
+          "<% if #{node}.can_write? %>#{wrap(res)}<% end %>"
         end
 
         # Find icon through a relation named 'icon' or use first image child

data/lib/zena/use/forms.rb

@@ -123,7 +123,8 @@ module Zena
 
         def make_input(form_helper, name, type, textarea = false)
           if type == Time
-            "<%= date_box(#{node}, :#{name}) %>"
+            code = RubyLess.translate(self, "this.#{name}")
+            "<%= date_box(#{node}, 'node[#{name}]', :value => #{code}) %>"
           elsif textarea
             "<%= #{form_helper}.text_area :#{name}, :id => '#{node.dom_prefix}_#{name}' %>"
           else
@@ -223,7 +224,7 @@ module Zena
 
               opts[:form_cancel] = %Q{
   <% if #{node}.new_record? %>
-  #{cancel_pre}<a href='javascript:void(0)' onclick='[\"<%= params[:dom_id] %>_add\", \"<%= params[:dom_id] %>\"].each(Element.toggle);return false;'>#{cancel_text}</a>#{cancel_post}
+  #{cancel_pre}<a href='javascript:void(0)' onclick='[\"<%= params[:dom_id] %>_add\", \"<%= params[:dom_id] %>_0\"].each(Element.toggle);return false;'>#{cancel_text}</a>#{cancel_post}
   <% else %>
   #{cancel_pre}<%= link_to_remote(#{cancel_text_ruby}, :url => #{node.form_name}_path(#{node}.zip) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=\#{params[:dom_id]}#{@context[:has_link_id] ? "&link_id=\#{#{node}.link_id}" : ''}\", :method => :get) %>#{cancel_post}
   <% end %>
@@ -266,7 +267,8 @@ module Zena
             # Ajax
             hidden_fields['link_id'] = "<%= #{node}.link_id %>" if @context[:has_link_id] && node.will_be?(Node)
 
-            if upd = @params[:update]
+            f = @method == 'form_tag' ? ancestor('form') : self
+            if upd = f && f.params[:update]
               if target = find_target(upd)
                 hidden_fields['u_url']   = target.template_url
                 hidden_fields['udom_id'] = upd # target.node.dom_prefix ? (but target.node is not set yet...)
@@ -453,24 +455,37 @@ module Zena
               selected = "#{node}.prop[#{attribute.inspect}].to_s"
             end
           end
-
-          html_id = html_attributes[:id] ? " id='#{html_attributes[:id]}'" : ''
+          
           if @context[:in_filter] || @params[:param]
-            select_tag = "<select#{html_id} name='#{attribute}'>"
+            html_attributes[:name] = attribute
           else
-            select_tag = "<select#{html_id} name='#{node.form_name}[#{attribute}]'>"
+            html_attributes[:name] = "#{node.form_name}[#{attribute}]"
           end
+          html_attributes.delete(:value)
+          select_tag = Zafu::Markup.new('select', html_attributes)
 
           res = if klass = @params[:root_class]
             class_opts = ''
             class_opts << ", :without => #{@params[:without].inspect}" if @params[:without]
+            tprefix = @params[:tprefix] || @params[:name] || @params[:param]
             # do not use 'selected' if the node is not new
-            "#{select_tag}<%= options_for_select(Node.classes_for_form(:class => #{klass.inspect}#{class_opts}, :class_attr => #{(@params[:attr] || 'name').inspect}), (#{node}.new_record? ? #{selected} : #{node}.klass)) %></select>"
+            options_list = Node.classes_for_form(:class => klass, :without => @params[:without], :class_attr => @params[:attr] || 'name')
+
+            if !tprefix.blank? && tprefix != 'false'
+              options_list.map! do |e|
+                if e[0] =~ /^([^a-zA-Z]*)(.*)$/
+                  [$1 + trans("#{tprefix}_#{$2}"), e[1]]
+                else
+                  e
+                end
+              end
+            end
+            select_tag.wrap "<%= options_for_select(#{options_list.inspect}, (#{node}.new_record? ? #{selected} : #{node}.klass)) %>"
           elsif @params[:type] == 'time_zone'
             # <r:select name='d_tz' type='time_zone'/>
-            "#{select_tag}<%= options_for_select(TZInfo::Timezone.all_identifiers, #{selected}) %></select>"
+            select_tag.wrap "<%= options_for_select(TZInfo::Timezone.all_identifiers, #{selected}) %>"
           elsif options_list = get_options_for_select
-            "#{select_tag}<%= options_for_select(#{options_list}, #{selected}) %></select>"
+            select_tag.wrap "<%= options_for_select(#{options_list}, #{selected}) %>"
           else
             parser_error("missing 'nodes', 'root_class' or 'values'")
           end
@@ -481,6 +496,7 @@ module Zena
 
         def r_input(skip_col = false)
           html_attributes, attribute = get_input_params()
+          
           erb_attr = html_attributes.delete(:erb_attr)
           # TODO: get attribute type from get_input_params
 
@@ -489,7 +505,7 @@ module Zena
             out "<% if #{node}.ptype == :string -%>"
             out r_textarea
             out "<% elsif #{node}.ptype == :datetime -%>"
-            res = "<%= date_box(#{node(Node)}, #{node}.name, :value => #{node(Node)}.prop[#{node}.name]) %>"
+            res = "<%= date_box(#{node(Node)}, %Q{node[\#{#{node}.name}]}, :value => #{node(Node)}.prop[#{node}.name]) %>"
             out extract_label(res, erb_attr)
             out "<% else -%>"
             out r_input(true)
@@ -503,8 +519,15 @@ module Zena
             r_select
           when 'date_box', 'date'
             return parser_error("date_box without name") unless attribute
-            if value = @params[:value]
-              code = ::RubyLess.translate(self, value)
+            if code = @params[:value]
+              code = ::RubyLess.translate(self, code)
+            elsif code = html_attributes[:value]
+              if code =~ /\A<%= .*?\((.+)\)\s*%>/
+                # remove <%= %>
+                code = $1
+              else
+                code = code.inspect
+              end
             else
               code = ::RubyLess.translate(self, "this.#{attribute}")
             end
@@ -514,7 +537,7 @@ module Zena
               html_params << ":#{key} => #{@params[key].inspect}" if @params[key]
             end
             html_params << ":id=>\"#{node.dom_id(:erb => false)}_#{attribute}\"" if node.dom_prefix
-            "<%= date_box(#{node}, #{attribute.inspect}, :value => #{value}, #{html_params.join(', ')}) %>"
+            "<%= date_box(#{node}, #{html_attributes[:name].inspect}, :value => #{value}, #{html_params.join(', ')}) %>"
           when 'id'
             return parser_error("select id without name") unless attribute
             name = "#{attribute}_id" unless attribute[-3..-1] == '_id'
@@ -532,7 +555,7 @@ module Zena
             @markup.done = false
             wrap('')
           else
-            # 'text', 'hidden', ...
+            # 'text', 'hidden', 'checkbox', ...
             return parser_error('Missing name.') unless attribute || html_attributes[:name]
             @markup.tag = 'input'
             @markup.set_param(:type, @params[:type] || 'text')
@@ -601,21 +624,6 @@ module Zena
 
         alias r_radio r_checkbox
 
-        # transform a 'show' tag into an input field.
-        #def make_input(params = @params)
-        #  input, attribute = get_input_params(params)
-        #  return parser_error("missing 'name'") unless attribute
-        #  return '' if attribute == 'parent_id' # set with 'r_form'
-        #  return '' if ['url','path'].include?(attribute) # cannot be set with a form
-        #  if params[:date]
-        #  input_id = @context[:dom_prefix] ? ", :id=>\"#{dom_id}_#{attribute}\"" : ''
-        #    return "<%= date_box(#{node}, #{params[:date].inspect}#{input_id}) %>"
-        #  end
-        #  input_id = node.dom_prefix ? " id='#{node.dom_prefix}_#{attribute}'" : ''
-        #  "<input type='#{params[:type] || 'text'}'#{input_id} name='#{input[:name]}' value='#{input[:value]}'/>"
-        #end
-        #
-
         # Parse params to extract everything that is relevant to building input fields.
         # TODO: refactor and pass the @markup so that attributes are added directly
         # TODO: get attribute type in get_input_params (safe_method_type)
@@ -646,26 +654,26 @@ module Zena
               end
             end
             
+            if value = params[:value]
+              # On refactor, use append_markup_attr(markup, key, value)
+              value = RubyLess.translate_string(self, value)
+
+              if value.literal
+                res[:value] = form_quote(value.literal.to_s)
+              else
+                res[:value] = "<%= fquote(#{value}) %>"
+              end
+            elsif params[:param]
+              res[:value] = "<%= fquote(#{sub_attr_ruby}) %>"
+            end
+            
             if sub_attr
-              type = node.klass.safe_method_type([attribute])
+              type = node.klass.safe_method_type([attribute], node)
               if sub_attr_ruby = RubyLess.translate(self, %Q{this.#{attribute}[#{sub_attr.inspect}]})
-                res[:value] = "<%= fquote #{sub_attr_ruby} %>"
-              end
-            else
-              if value = params[:value]
-                # On refactor, use append_markup_attr(markup, key, value)
-                value = RubyLess.translate_string(self, value)
-
-                if value.literal
-                  res[:value] = form_quote(value.literal.to_s)
-                else
-                  res[:value] = "<%= fquote #{value} %>"
-                end
-              elsif params[:param]
-                res[:value] = "<%= fquote #{sub_attr_ruby} %>"
-              elsif attribute && type = node.klass.safe_method_type([attribute])
-                res[:value] = "<%= fquote #{node}.#{type[:method]} %>"
+                res[:value] ||= "<%= fquote(#{sub_attr_ruby}) %>"
               end
+            elsif attribute && type = node.klass.safe_method_type([attribute], node)
+              res[:value] ||= "<%= fquote(#{node}.#{type[:method]}) %>"
             end
 
             if sub_attr && params[:type] == 'checkbox' && !params[:value]
@@ -673,29 +681,16 @@ module Zena
               res[:value] = sub_attr
             end
 
-            #if @context[:in_add]
-            #  res[:value] = (params[:value] || params[:set_value]) ? ["'#{ helper.fquote(params[:value])}'"] : ["''"]
-            #elsif @context[:in_filter]
-            #  res[:value] = attribute ? ["'<%= fquote params[#{attribute.to_sym.inspect}] %>'"] : ["''"]
-            #elsif params[:value]
-            #  res[:value] = ["'#{ helper.fquote(params[:value])}'"]
-            #else
-            #  if nattr != 'nil'
-            #    res[:value] = ["'<%= fquote #{nattr} %>'"]
-            #  else
-            #    res[:value] = ["''"]
-            #  end
-            #end
           elsif node.will_be?(Column)
             res[:erb_attr] = "<%= #{node}.name %>"
             res[:name]  = "node[<%= #{node}.name %>]"
             res[:value] = "<%= fquote #{node(Node)}.prop[#{node}.name] %>"
           end
-
-          if node.dom_prefix && !params[:param]
-            res[:id] = params[:id] || "#{@context[:form_prefix]}_#{attribute}"
-          else
-            res[:id] = params[:id] if params[:id]
+          
+          if params[:id]
+            res[:id] = params[:id]
+          elsif base = @context[:form_prefix]
+            res[:id] = "#{base}_#{attribute}"
           end
           
           if params[:type] == 'checkbox' && sub_attr_ruby
@@ -707,11 +702,16 @@ module Zena
           end
 
           params.each do |k, v|
-            next unless [:size, :style, :class].include?(k)
-            res[k] = params[k]
+            if [:size, :style, :class].include?(k) || k.to_s =~ /^data-/
+              res[k] = params[k]
+            end
+          end
+          
+          if sub_attr
+            return [res, "#{attribute}_#{sub_attr}"]
+          else
+            return [res, attribute]
           end
-
-          return [res, attribute]
         end
 
         # TODO: add parent_id into the form !
@@ -801,10 +801,15 @@ module Zena
               elsif show = @params[:tshow]
                 show_values = translate_list(show)
               else
-                tprefix = @params[:tprefix] || @params[:name]
+                tprefix = @params[:tprefix] || @params[:name] || @params[:param]
+                if tprefix == 'false'
+                  tprefix = ''
+                else
+                  tprefix = "#{tprefix}_"
+                end
                 show_values = options_list.map do |v|
-                  t = trans("#{tprefix}_#{v}")
-                  if t == "#{tprefix}_"
+                  t = trans("#{tprefix}#{v}")
+                  if t == tprefix
                     ''
                   else
                     t
@@ -820,16 +825,32 @@ module Zena
               options_list.inspect
             elsif code = @params[:eval]
               ruby = ::RubyLess.translate(self, code)
-              if !ruby.klass.kind_of?(Array)
-                return parser_error("invalid eval: should return an Array (found #{ruby.klass})")
-              end
+              if ruby.klass.kind_of?(Array)
+                if ruby.klass.first <= String
+                  ruby
+                else
+                  return parser_error("cannot extract values from eval (not a String list: [#{ruby.klass.first}])")
+                end
+              elsif ruby.klass <= String
+                if ruby.could_be_nil?
+                  ruby = "(#{ruby} || '')"
+                else
+                  ruby = "(#{ruby})"
+                end
+                
+                dict = get_context_var('set_var', 'dictionary')
 
-              if ruby.klass.first <= String
-                # ok
-                ruby
+                if dict && dict.klass <= ::Zena::Use::I18n::TranslationDict
+                  trans = "#{dict}.get"
+                else
+                  trans = "trans"
+                end
+                
+                ruby = "#{ruby}.split(',').map(&:strip).map {|e| [#{trans}(e), e]}"
               else
-                return parser_error("cannot extract values from eval (not a String list: [#{ruby.klass.first}])")
+                return parser_error("invalid eval: should return an Array or String (found #{ruby.klass})")
               end
+
             end
           end