diff --git a/app/views/admin/page_parts/_edit.html.erb b/app/views/admin/page_parts/_edit.html.erb index 828e03a2..78a20b37 100644 --- a/app/views/admin/page_parts/_edit.html.erb +++ b/app/views/admin/page_parts/_edit.html.erb @@ -12,6 +12,6 @@ <% end %>

- <%= f.submit t(:update) %> <%= link_back %> + <%= f.submit t(:update_) %> <%= link_back %>

<% end %> diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index c8075b24..026a43d0 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -389,6 +389,7 @@ zh_tw: paper: Paper was successfully updated. user: User was successfully updated. success_: S使用者已更新成功 + update_: 更新 update_at: 最後更新時間 url: 網址 use_status: '' diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb index c3c43fe8..d0c1eab6 100644 --- a/lib/parsers/parser_back_end.rb +++ b/lib/parsers/parser_back_end.rb @@ -30,6 +30,7 @@ module ParserBackEnd parse_images_edit(body, page) parse_footer_edit(body, page) parse_sub_menu_edit(body, page) + parse_counter_edit(body) public_r_tags.each do |tag| send("parse_#{tag}s_edit", body, page, true) end diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 794fb4fd..acdd43b8 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -233,7 +233,7 @@ module ParserCommon end # page_counter - def parse_counter(body = nil, page = nil, edit=nil) + def parse_counter_edit(body = nil) body.css('.page_counter').each do |counter| res = '' case counter['option'] diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 119c2706..763eeba7 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -11,6 +11,7 @@ module ParserFrontEnd parse_images(body, page) parse_menu(body, page) parse_sub_menu(body, page, site) + parse_counter(body) i18n.merge!({locale => body.to_html}) end i18n @@ -21,10 +22,14 @@ module ParserFrontEnd tag = params[:tag_id].blank? ? page[:tag] : params[:tag_id] body = Nokogiri::HTML(page.content) body.css('orbit_front').each do |front| - ret = '' - part = PagePart.find(front['part_id']) if front['part_id'] - ret << eval("\"#{front['path']}\"") rescue '' - fragment = Nokogiri::HTML::DocumentFragment.new(body, "
") + if front['class'] && front['class'].include?('dymanic_load') + ret = '' + part = PagePart.find(front['part_id']) if front['part_id'] + ret << eval("\"#{front['path']}\"") rescue '' + fragment = Nokogiri::HTML::DocumentFragment.new(body, "
") + else + fragment = Nokogiri::HTML::DocumentFragment.new(body, eval("#{front['value']}").to_s) + end front.swap(fragment) end body.to_html @@ -131,6 +136,26 @@ module ParserFrontEnd end end + def parse_counter(body = nil) + body.css('.page_counter').each do |counter| + ret = '' + case counter['option'] + when 'all' + ret << "display_visitors" + when 'today' + ret << "display_visitors_today" + when 'this_week' + ret << "display_visitors_this_week" + when 'this_month' + ret << "display_visitors_this_month" + when 'this_year' + ret << "display_visitors_this_year" + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, "") + counter.swap(fragment) + end + end + # ad_banners def generate_ad_banners(*args) "
"