diff --git a/app/controllers/event_news_mods_controller.rb b/app/controllers/event_news_mods_controller.rb index 3e14ca7..63ea664 100644 --- a/app/controllers/event_news_mods_controller.rb +++ b/app/controllers/event_news_mods_controller.rb @@ -103,7 +103,8 @@ class EventNewsModsController < ApplicationController "img_src" => image_url || DefaultImgSrc, "img_description" => desc, "more" => t("event_news.more"), - "view_count" => a.view_count + "view_count" => a.view_count, + "orbithashtags" => a.hashtags_for_frontend } else a @@ -516,6 +517,9 @@ class EventNewsModsController < ApplicationController if tags.blank? tags = ["all"] end + if OrbitHelper.params["hash"].present? + hashtag = OrbitHelper.params["hash"] + end subpart = OrbitHelper.get_current_widget widget_data_count = OrbitHelper.widget_data_count event_news_cache = EventNewsCache.where(parent_id: subpart.id.to_s + cats.to_s + tags.to_s + widget_data_count.to_s,locale: I18n.locale.to_s) @@ -739,6 +743,7 @@ class EventNewsModsController < ApplicationController "place_text" => (event_news.place.blank? ? "" : "#{EventNewsCustomTitle.get_trans("place")}: #{event_news.place}"), "place-css" => (event_news.place.blank? ? "display: none;" : ""), "carousel_html" => carousel_html, + "orbithashtags" => event_news.hashtags_for_frontend }, "impressionist" => (event_news.is_preview ? nil : event_news), "url_to_edit"=>url_to_edit diff --git a/app/helpers/event_news_helper.rb b/app/helpers/event_news_helper.rb index ce76249..1e4a2d1 100644 --- a/app/helpers/event_news_helper.rb +++ b/app/helpers/event_news_helper.rb @@ -199,10 +199,15 @@ module EventNewsHelper event_news = @show_today_data_first ? EventNews.can_display_and_sorted_according_today : EventNews.can_display_and_sorted - - event_news = event_news + if params["orbithashtag"].present? + event_news = event_news + .filter_by_categories(categories, false).filter_by_hashtag(OrbitHelper.page_hashtag_id) + .where(:title.nin => ["",nil]) + else + event_news = event_news .filter_by_categories(categories, false).filter_by_tags(tags) .where(:title.nin => ["",nil]) + end if @type == "show_widget" if !params[:uids].blank? member_profile = MemberProfile.any_in(:uid=>params[:uids]) @@ -255,14 +260,14 @@ module EventNewsHelper tmp1 ? 0 : 1, tmp1 ? nil : event_news["event_date"].to_time, tmp2 ? 0 : 1, tmp2 ? nil : event_news["postdate"].to_time ] - } + } end if !@show_today_data_first event_news_list = event_news_list.reverse end else if enable_manually_sort - event_news_list = event_news_list.sort_by { |event_news| + event_news_list = event_news_list.sort_by { |event_news| tmp1 = event_news["event_date"].blank? tmp2 = event_news["postdate"].blank? [ @@ -272,7 +277,7 @@ module EventNewsHelper ] }.reverse else - event_news_list = event_news_list.sort_by { |event_news| + event_news_list = event_news_list.sort_by { |event_news| tmp1 = event_news["event_date"].blank? tmp2 = event_news["postdate"].blank? [ @@ -309,7 +314,7 @@ module EventNewsHelper if wrap_elements.count > 0 htmls = parsing_repeats_again(wrap_elements,d[data_name][i], level + 1) htmls[0].each_with_index do |html,i| - element = element.gsub(html,htmls[1][i]) + element = element.gsub(html,htmls[1][i]) end end item.each do |key,value| @@ -345,11 +350,11 @@ module EventNewsHelper doc = Nokogiri::HTML(file, nil, "UTF-8") file.close controller = EventNewsController.new - begin + begin data = @data# rescue nil - rescue Exception => e + rescue Exception => e write_debug_file(e,'event_news_mod',@target_action) if Site::DEBUG - end + end if !data.nil? wrap_elements = doc.css("*[data-list][data-level='0']") htmls = parsing_repeats_again(wrap_elements,data,1) @@ -382,11 +387,11 @@ module EventNewsHelper doc = Nokogiri::HTML(file, nil, "UTF-8") file.close controller = EventNewsController.new - begin + begin data = @data# rescue nil - rescue Exception => e + rescue Exception => e write_debug_file(e,'event_news_mod',@target_action) if Site::DEBUG - end + end if data.nil? return "
No content to show.
".html_safe end @@ -491,8 +496,8 @@ module EventNewsHelper if layout_types.empty? Dir.glob("#{Rails.root}/app/templates/#{@key}/modules/#{module_app}/*").each do |w| next if File.ftype(w).eql?("directory") - w = File.basename(w, ".*") - w = File.basename(w, ".*") + w = File.basename(w, ".*") + w = File.basename(w, ".*") if w[0,1] != "_" && w[0,1] != "s" && w != "info" layout_types << w end @@ -500,6 +505,58 @@ module EventNewsHelper end layout_types end + def render_ad_banner(event_carousel_images,data) + ("
+
+
" + + event_carousel_images.collect do |e| + "
+ \"#{e['description_text']}\" +
+

#{e['description']}

+
+
+
" + end.join+ + "
+ + +
+
+

1/#{data['carousel_count']}

+ + +
+
").html_safe + end def complementaryColor(my_hex) if my_hex[0] == '#'