From 3c283d1a7a85e808d5317b0e61bcf64ffb017a9f Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 16 Aug 2012 17:24:12 +0800 Subject: [PATCH] Set default picture Fix tags where not in params for index fronted (news and announcement) Change backend index for news Home banner link for images and main title --- app/assets/images/news_alt.jpg | Bin 0 -> 21854 bytes app/uploaders/image_uploader.rb | 4 ++++ .../front_end/bulletins_controller.rb | 4 ++-- .../news/front_end/news_bulletins_controller.rb | 4 ++-- .../news_bulletins/_news_bulletin.html.erb | 5 +++-- .../news_bulletins/_news_bulletins.html.erb | 2 +- .../news_bulletins/_sort_headers.html.erb | 4 ++-- .../front_end/news_bulletins/index.html.erb | 2 +- .../widget/news_bulletins/home_banner.html.erb | 4 ++-- .../built_in_modules/news/config/locales/en.yml | 1 + 10 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 app/assets/images/news_alt.jpg diff --git a/app/assets/images/news_alt.jpg b/app/assets/images/news_alt.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a7b1fb329b2c448e18c6553eeea5f614c4e0a47a GIT binary patch literal 21854 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 literal 0 HcmV?d00001 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%>
    @@ -71,6 +71,7 @@
- <%= 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 @@
    <% @news_bulletins.each do |post| %>
  • -
    <%= image_tag(post.image.url, :size => "290x130") if post.image.file %>
    +
    <%= link_to image_tag(post.image.url, :size => "290x130"), panel_news_front_end_news_bulletin_path(post, :category_id => post.news_bulletin_category_id) %>

    <%= link_to post.title, panel_news_front_end_news_bulletin_path(post, :category_id => post.news_bulletin_category_id) %>

    <%= post.subtitle.html_safe rescue '' %>

    • diff --git a/vendor/built_in_modules/news/config/locales/en.yml b/vendor/built_in_modules/news/config/locales/en.yml index 872bcddc..98667b9a 100644 --- a/vendor/built_in_modules/news/config/locales/en.yml +++ b/vendor/built_in_modules/news/config/locales/en.yml @@ -83,6 +83,7 @@ en: approval_pass: 'Pass' approval_setting_window_title: 'Unit' update_success: Successfully Updated + unit_name: Unit name # admin: # action: Action # add_language: Add language