new ui member bug and interface fix
This commit is contained in:
1 parent
82b6be483a
commit
3123c5de0a
26 files changed
+365
-295
No files matched your search
@@ -34,7 +34,8 @@ module AttributeFieldsHelper
|
||||
value = (can_muti_lang_input? ? @prefiled_value[key] : @prefiled_value) rescue nil
|
||||
key_field = can_muti_lang_input? ? "[#{key}]" : ""
|
||||
place_holder= @panel_setting["placeholder"][key] rescue ''
|
||||
result = text_area_tag(get_field_name_base + key_field, value,@markup_options.merge({:placeholder=>place_holder,:for=>key}))
|
||||
# result = text_area_tag(get_field_name_base + key_field, value,@markup_options.merge({:placeholder=>place_holder,:for=>key}))
|
||||
result = text_field_tag(get_field_name_base + key_field, value,@markup_options.merge({:placeholder=>place_holder,:for=>key}))
|
||||
|
||||
add_ext= @attribute_value.address_ext[key] rescue {}
|
||||
|
||||
@@ -181,7 +182,7 @@ protected
|
||||
def lang_panel_tabbable_wrapper(add_more_params,&block)
|
||||
add_more_counter = ''
|
||||
|
||||
if self.markup=='text_area' or self.markup=='address'
|
||||
if self.markup=='text_area' #or self.markup=='address'
|
||||
|
||||
tmp1 = VALID_LOCALES.collect do |key|
|
||||
value = @prefiled_value[key] rescue nil
|
||||
@@ -261,7 +262,7 @@ protected
|
||||
link_to(I18nVariable.from_locale(key),link_entry,:data=>{:toggle=>"tab"},:class=>"btn #{(key == I18n.locale.to_s ? "active" : nil)}",:for=>key)
|
||||
end # of VALID_LOCALES.collect for tabs
|
||||
|
||||
buff2 << link_to((content_tag :i,'',:class=>'icon-edit'),"##{get_pairing_tab_class({})}_m_window", :role=>"button",:class=>'btn',:data=>{:toggle=>"modal"}) if self.markup == 'address'
|
||||
buff2 << link_to((content_tag :i,'',:class=>'icon-edit'),"#address-field", :role=>"button",:class=>'btn',:data=>{:toggle=>"modal"}) if self.markup == 'address'
|
||||
buff2 << link_to((content_tag :i,'',:class=>'icon-trash'),"#",:class=>"btn remove-input") if self.add_more
|
||||
buff2.join.html_safe
|
||||
end # of content ul
|
||||
@@ -357,7 +358,7 @@ protected
|
||||
|
||||
# address = content_tag :div,:class=>"multipleInput editMore" do
|
||||
address = content_tag :div,:class=>"control-group" do
|
||||
label + content_tag(:div, controls_wrapper(&block), :class=>'controls')
|
||||
label + content_tag(:div, controls_wrapper(&block), :class=>'controls add-input')
|
||||
end # of div multipleInput editMore
|
||||
|
||||
result = address
|
||||
@@ -452,7 +453,7 @@ protected
|
||||
def gen_modal_dialog
|
||||
render_anywhere("shared/attribute_field/address_modal_dialog",{
|
||||
:field_name=>title,
|
||||
:html_id=>"#{get_pairing_tab_class({})}_m_window",
|
||||
:html_id=>"address-field",
|
||||
:btn_class => "#{get_pairing_tab_class({})}",
|
||||
:field_name_basic => get_basic_field_name_base
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user