diff --git a/app/assets/images/news_alt.jpg b/app/assets/images/news_alt.jpg new file mode 100644 index 00000000..a7b1fb32 Binary files /dev/null and b/app/assets/images/news_alt.jpg differ diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb index 29a4d92b..651cd3cf 100644 --- a/app/uploaders/image_uploader.rb +++ b/app/uploaders/image_uploader.rb @@ -3,6 +3,7 @@ class ImageUploader < CarrierWave::Uploader::Base require 'mime/types' + include Sprockets::Helpers::RailsHelper process :set_content_type @@ -30,6 +31,9 @@ class ImageUploader < CarrierWave::Uploader::Base # def default_url # "/images/fallback/" + [version_name, "default.png"].compact.join('_') # end + def default_url + "news_alt.jpg" + end # Process files as they are uploaded: # process :scale => [200, 300] diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb index a5cad78d..a828d42a 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb @@ -30,7 +30,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController date_now = Time.now if !params[:category_id].blank? && !params[:tag_id].blank? @tag = AnnouncementTag.find(params[:tag_id]) rescue nil - @tag = AnnouncementTag.where(key: params[:tag_id])[0] unless @tag + @tag = AnnouncementTag.where(id: params[:tag_id])[0] unless @tag @bulletins = @tag.bulletins.available_for_lang(I18n.locale).can_display.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page_main]).per(15) @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil elsif !params[:category_id].blank? @@ -38,7 +38,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil elsif !params[:tag_id].blank? @tag = AnnouncementTag.find(params[:tag_id]) rescue nil - @tag = AnnouncementTag.where(key: params[:tag_id])[0] unless @tag + @tag = AnnouncementTag.where(id: params[:tag_id])[0] unless @tag @bulletins = @tag.bulletins.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page_main]).per(15) else @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page_main]).per(15) diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb index 0e9f0ac3..502f78b7 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb @@ -31,7 +31,7 @@ class Panel::News::FrontEnd::NewsBulletinsController < OrbitWidgetController date_now = Time.now if !params[:category_id].blank? && !params[:tag_id].blank? @tag = NewsTag.find(params[:tag_id]) rescue nil - @tag = NewsTag.where(key: params[:tag_id])[0] unless @tag + @tag = NewsTag.where(id: params[:tag_id])[0] unless @tag @news_bulletins = @tag.news_bulletins.available_for_lang(I18n.locale).can_display.where(:news_bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page_main]).per(15) @current_category = NewsBulletinCategory.from_id(params[:category_id]) rescue nil elsif !params[:category_id].blank? @@ -39,7 +39,7 @@ class Panel::News::FrontEnd::NewsBulletinsController < OrbitWidgetController @current_category = NewsBulletinCategory.from_id(params[:category_id]) rescue nil elsif !params[:tag_id].blank? @tag = NewsTag.find(params[:tag_id]) rescue nil - @tag = NewsTag.where(key: params[:tag_id])[0] unless @tag + @tag = NewsTag.where(id: params[:tag_id])[0] unless @tag @news_bulletins = @tag.news_bulletins.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page_main]).per(15) else @news_bulletins = NewsBulletin.all.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page_main]).per(15) diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb index 20126c09..01decfbd 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb @@ -28,7 +28,7 @@ - <%= news_bulletin.news_bulletin_category.title rescue nil %> + <%= show_news_bulletin_title_at_index news_bulletin%>
- <%= User.from_id(news_bulletin.update_user_id).name rescue ''%> + <%= news_bulletin.view_count rescue nil %> + <%= news_bulletin.unit_list_for_anc.title rescue nil %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletins.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletins.html.erb index eb1c9781..5ed04c76 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletins.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletins.html.erb @@ -2,11 +2,11 @@ - + diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_sort_headers.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_sort_headers.html.erb index 66d3269b..34586da4 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_sort_headers.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_sort_headers.html.erb @@ -1,8 +1,8 @@ <%= render_sort_bar(true, delete_panel_news_back_end_news_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', 'news_bulletin.status'], - ['category', 'news_bulletin_category', 'span1-2', 'news_bulletin.category'], ['title', 'title','span7', 'news_bulletin.title'], ['start_date', 'postdate', 'span1-2', 'news_bulletin.start_date'], ['end_date', 'deadline', 'span1-2', 'news_bulletin.end_date'], ['tags', 'tags', 'span1-2', 'news_bulletin.tags'], - ['last_modified', 'update_user_id','span1-3', 'news_bulletin.last_modified']).html_safe %> \ No newline at end of file + ['view_count', 'view_count','span1-2', 'view_count'], + ['unit_list_for_anc', 'unit_list_for_anc','span1-3', 'news.news_bulletin.unit_name']).html_safe %> \ No newline at end of file diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb index fc232e8b..2a7c1668 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb @@ -22,7 +22,7 @@ <% @news_bulletins.each do |post| %> - <%= image_tag post.image rescue nil %> + <%= image_tag post.image.url %> <%= link_to post.title, panel_news_front_end_news_bulletin_path(post), :class => 'news_title' %> <%= post.subtitle.html_safe rescue '' %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb index eb3cf591..62e2e958 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb @@ -1,5 +1,5 @@ <% if @news_bulletins and !@news_bulletins.nil? %> -

<%= t('news.campus_news')%>

+

<%= link_to t('news.campus_news'), panel_news_front_end_news_bulletins_path %>

<%#= link_to t('news.more'),panel_news_front_end_news_bulletins_path(), :class => "topic_note" %>
@@ -19,7 +19,7 @@