css fixes

app/assets/stylesheets/event_news_front.css.scss

@@ -150,3 +150,19 @@ ul.button-mid .next-button {
 .next-button,.prev-button{
   cursor: pointer;
 }
+a.orbit-hash-tag {
+    list-style: none;
+    background: #e0edff;
+    color: #0a84ff;
+    margin-right: 0.5em;
+    border-radius: 0.5em;
+    padding: 0.2em 0.5em;
+    margin-bottom: 0.5em;
+    display: inline-block;
+    &:hover{
+        background: #0a84ff;
+        transform: translatey(-2px);
+        transition: transform 0.4s;
+        color: #fff;
+    }
+}

app/assets/stylesheets/template/modules/event_news.scss

@@ -690,3 +690,5 @@
     background-color: lighten($theme-color-main, 10%);
   }
 }
+
+

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)
@@ -724,7 +728,8 @@ class EventNewsModsController < ApplicationController
         "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{event_news.carousel_image_width};margin: auto;"),
         "carousel_count" => event_carousel_images.count,
         "place_text" => (event_news.place.blank? ? "" : "#{EventNewsCustomTitle.get_trans("place")}: #{event_news.place}"),
-        "place-css" => (event_news.place.blank? ? "display: none;" : "")
+        "place-css" => (event_news.place.blank? ? "display: none;" : ""),
+        "orbithashtags" => event_news.hashtags_for_frontend
       },
       "impressionist" => (event_news.is_preview ? nil : event_news),
       "url_to_edit"=>url_to_edit

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])

app/models/event_news.rb

@@ -6,6 +6,7 @@ class EventNews
   include OrbitModel::Impression
   # encoding: utf-8
   include OrbitTag::Taggable
+  include OrbitHashtag::Hashtaggable
   include OrbitCategory::Categorizable
   include Slug
   require 'event_news_mod/cache'

app/views/admin/event_news/_form.html.erb

@@ -54,6 +54,7 @@
       <li><a href="#status" data-toggle="tab"><%= t(:status) %></a></li>
     <% end %>
     <li><a href="#tag" data-toggle="tab"><%= t(:tags) %></a></li>
+    <li><a href="#hashtag" data-toggle="tab"><%= t(:hashtags) %></a></li>
     <li><a href="#imageupload" data-toggle="tab"><%= t('event_news.image') %></a></li>
     <li><a href="#carousel_image_upload" data-toggle="tab" title="<%= t('event_news.carousel_image_title') %>"><%= t('event_news.carousel_image') %></a></li>
     <li><a href="#mail-group" data-toggle="tab"><%= t('event_news.email_reminder')%></a></li>    
@@ -275,6 +276,14 @@
       </div>
     </div>
 
+    <!-- Hashtag Module -->
+    <div class="tab-pane fade" id="hashtag">
+      <div class="control-group">
+        <label class="control-label muted"><%= t(:hashtags) %></label>
+        <%= select_hashtags(f, @module_app) %>
+      </div>
+    </div>
+
     <!-- Images Module -->
     <div class="tab-pane fade" id="imageupload">
 

lib/event_news_mod/engine.rb

@@ -125,6 +125,7 @@ module EventNewsMod
           widget_methods ["widget","random_event_news_widget", "tag_cloud"]
           widget_settings [{"data_count"=>30}]
           taggable "EventNews"
+          hashtaggable "EventNews"
           categorizable
           authorizable
           frontend_enabled