Compare commits

..

2 Commits

Author SHA1 Message Date
spen 39990efd15 update default_widget field i18n 2014-05-12 11:19:37 +08:00
Manson Wang bf815b168a ntu_ga 2014-02-11 14:18:10 +08:00
16 changed files with 48 additions and 320 deletions

3
README
View File

@ -1,3 +0,0 @@
Orbit Announcement
Version 0.0.3

View File

@ -1,5 +1,3 @@
= Announcement
This project rocks and uses MIT-LICENSE.
* Tagging
* Categories
This project rocks and uses MIT-LICENSE.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -1,83 +0,0 @@
# API for Announcement Module
#
# Simple access control
# params[:access_token] = Site ID
# ex: /panel/announcement/api/bulletins.json?access_token=5301d8be45d5f42f4f000001
#
# Set Language
# Language can be "zh_tw" or "en"
# ex: /panel/announcement/api/bulletins.json?lang=en&access_token=5301d8be45d5f42f4f000001
#
# Get Categories and Tags
# ex: /panel/announcement/api/categories_tags.json&access_token=5301d8be45d5f42f4f000001
#
# Query Bulletins
# Set page number use params[:page_num]
# Set number of results per page use params[:per_page]
# ex: /panel/announcement/api/bulletins.json?page_num=3&per_page=15&access_token=5301d8be45d5f42f4f000001
#
# Filter bulletins with categories use params[:categories]
# ex: /panel/announcement/api/bulletins.json?categories[]=53046e4045d5f462a2000006&access_token=5301d8be45d5f42f4f000001
#
# Filter bulletins with tags use params[:tags]
# ex: /panel/announcement/api/bulletins.json?tags[]=5318e58d45d5f41127000007&access_token=5301d8be45d5f42f4f000001
#
# Filter bulletins with "is_hot" use params[:is_hot]
# ex: /panel/announcement/api/bulletins.json?is_hot=1&access_token=5301d8be45d5f42f4f000001
#
# Search bulletin title, subtitle, text with params[:keyword]
# ex: /panel/announcement/api/bulletins.json?keyword=大學&access_token=5301d8be45d5f42f4f000001
class Panel::Announcement::Api::BulletinsController < OrbitWidgetController
before_filter :set_I18n, :check_site_id
def get_categories_tags
module_id = ModuleApp.where(:key=>"announcement").first.id
categories = Category.where(:module_app_id => module_id).collect{|c| {"id"=>c.id, "title"=>c.title_translations}}
module_tags = ModuleTag.where(:module_app_id => module_id).collect{|t| t.id}
tags = Tag.any_of({:tag_lease_id.in => module_tags}).collect{|t| {"id"=>t.id, "title"=>t.name_translations}}
render :json => {
"categories" => categories,
"tags" => tags
}
end
def get_bulletins
page_num = params[:page_num].blank? ? 0 : params[:page_num].to_i
per_page = params[:per_page].blank? ? 10 : params[:per_page].to_i
per_page = per_page > 0 ? per_page : 10
if !params[:keyword].blank?
keyword = Regexp.new(".*"+params[:keyword]+".*")
bulletins = Bulletin.any_of({:title=>keyword},{:subtitle=>keyword},{:text=>keyword}).available_for_lang(I18n.locale)
else
bulletins = Bulletin.available_for_lang(I18n.locale)
end
bulletins = bulletins.where(:is_hot => params[:is_hot]) if !params[:is_hot].blank?
bulletins = bulletins.where(:category_id.in => params[:categories]) if !params[:categories].blank?
bulletins = bulletins.where(:tagged_ids.in => params[:tags]) if !params[:tags].blank?
bulletins = bulletins.desc( :is_top, :postdate).page(page_num).per(per_page)
total_pages = (bulletins.count / per_page) + 1
render :json => {
"bulletins" => bulletins,
"bulletins_count" => bulletins.count,
"page_num" => page_num,
"total_pages" => total_pages,
"lang"=>I18n.locale
}
end
protected
def set_I18n
I18n.locale = params[:lang] if params[:lang].present?
end
def check_site_id
raise ActionController::RoutingError.new('Not Found') if Site.first.id.to_s != params['access_token']
end
end

View File

@ -1,4 +1,3 @@
# encoding: utf-8
class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# include OrbitControllerLib::DivisionForDisable
@ -49,7 +48,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# GET /bulletins/new.xml
def new
if(session[:in_validate_object].blank?)
@bulletin = Bulletin.new(:postdate => DateTime.now, :email_sentdate => DateTime.now)
@bulletin = Bulletin.new(:postdate => DateTime.now)
else
@bulletin = session[:in_validate_object]
session[:in_validate_object] = {}
@ -66,7 +65,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# GET /bulletins/1/edit
def edit
@bulletin = Bulletin.find(params[:id])
@email_users = @bulletin.get_email_users
@users = @bulletin.get_users
@tags = get_tags
is_authorized_sub_manager = @bulletin.category.auth_sub_manager.authorized_user_ids rescue nil
@ -85,10 +84,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# POST /bulletins.xml
def create
@tags = get_tags
params[:bulletin][:email_user_ids] = params[:bulletin][:email_user_ids].uniq
params[:bulletin][:email_user_ids].delete('')
@bulletin = Bulletin.new(params[:bulletin])
@bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil)
@ -103,14 +98,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
respond_to do |format|
if @bulletin.save
if @bulletin.email_sent == true && (is_manager? || is_admin?)
send_email_data(@bulletin)
@bulletin.email_sent = false
@bulletin.save
end
format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
format.xml { render :xml => @bulletin, :status => :created, :location => @bulletin }
# format.js
@ -137,24 +124,10 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
def update
@bulletin = Bulletin.find(params[:id])
params[:bulletin][:tag_ids] = (params[:bulletin][:tag_ids] ? params[:bulletin][:tag_ids] : [])
params[:bulletin][:email_user_ids] = params[:bulletin][:email_user_ids].uniq
params[:bulletin][:email_user_ids].delete('')
params[:bulletin][:update_user_id] = current_user.id
delete_out_invalid_date_from_params
respond_to do |format|
if @bulletin.update_attributes(params[:bulletin])
if @bulletin.email_sent == true && (is_manager? || is_admin?)
send_email_data(@bulletin)
@bulletin.email_sent = false
@bulletin.save
end
format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) }
format.js { render 'toggle_enable' }
format.xml { head :ok }
@ -192,45 +165,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
protected
def send_email_data(bulletin)
@site = Site.first
@user = User.find(bulletin.create_user_id)
@host = request.host_with_port
@group_mail = MailCron.get_send_group_mail( bulletin.email_user_ids , bulletin.other_mailaddress )
if !@group_mail.join.blank?
@mail_content = {
"host" => @host,
"lang" => I18n.locale,
"site_title" => @site.title,
"title" => bulletin.title,
"template" => 'announcement_mailer/cron_mail',
"url" => "http://#{@host}#{panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.category.id)}"
}
@mail_cron = {
:mail_from_app => 'announcement',
# :mail_from => @user.email,
# :mail_reply_to => @user.email,
:mail_subject => "#{t("announcement.mail_subject",:site_title => @site.title)}#{bulletin.title}",
:mail_to => @group_mail.join(','),
:mail_content => @mail_content ,
:mail_sentdate => bulletin.email_sentdate,
:create_user_id => bulletin.create_user_id,
:update_user_id => bulletin.create_user_id
}
@mail_cron = MailCron.new(@mail_cron)
@mail_cron.save
end
end
def delete_out_invalid_date_from_params
if((params[:bulletin]["deadline(1i)"] && params[:bulletin]["deadline(1i)"].blank?) or (params[:bulletin]["deadline(2i)"] && params[:bulletin]["deadline(2i)"].blank?) or (params[:bulletin]["deadline(3i)"] && params[:bulletin]["deadline(3i)"].blank?))
params[:bulletin].delete("deadline(1i)")

View File

@ -12,13 +12,8 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
if params[:search_query] == ""
@bulletins = get_bulletins_for_index
else
key_string = params[:search_query]
keywords = key_string.split(/\s+(?=(?:[^"]*"[^"]*")*[^"]*$)/)
regex = Regexp.union(keywords.map{|word| Regexp.new(".*"+word+".*", "i")})
query = ["title","subtitle","text"].map{|f| {f.to_sym => regex} }
res = Bulletin.any_of(query)
search_result = res.collect{|result| result.id}
@search = Bulletin.tire.search "#{params[:search_query]}"
search_result = @search.collect{|result| result.id}
@bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_in(_id:search_result).page( params[:page_main]).per(@page_num)
end

View File

@ -146,15 +146,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
@selected_tag = Tag.find(params[:tag_id]).first
@ModuleApp = ModuleApp.first(:conditions => {:key=>'web_resource'})
@link_module_tag = ModuleTag.first(:conditions => {:name => @selected_tag.name, :module_app_id => @ModuleApp.id})
# @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :tag_lease_id => @ModuleApp.id})
if !@link_module_tag.blank?
@link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :tag_lease_id => @link_module_tag.id})
else
@link_selected_tag = @link_module_tag
end
@link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp.id})
@web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
end

View File

@ -13,10 +13,10 @@ class Bulletin
include OrbitModel::TimeFrame
include OrbitTag::Taggable
# include Tire::Model::Search
# include Tire::Model::Callbacks
include Tire::Model::Search
include Tire::Model::Callbacks
is_impressionable
is_impressionable :counter_cache => { :column_name => :view_count }
field :title, localize: true
field :subtitle, localize: true
@ -24,15 +24,13 @@ class Bulletin
field :create_user_id
field :update_user_id, :class_name => "User"
field :user_ids
field :view_count, :type => Integer, :default => 0
field :public, :type => Boolean, :default => true
field :rss_link
field :email_sent, :type => Boolean, :default => false
field :email_sentdate , :type => DateTime
field :email_user_ids
field :other_mailaddress
mount_uploader :image, ImageUploader
@ -44,9 +42,9 @@ class Bulletin
validates :title, :at_least_one => true
# def to_indexed_json
# self.to_json
# end
def to_indexed_json
self.to_json
end
# search_in :title, :subtitle, :text
@ -154,12 +152,8 @@ class Bulletin
preview_object
end
def get_email_users
User.find(self.email_user_ids) rescue []
end
def view_count
Impression.where(:impressionable_id=>self.id).count
def get_users
User.find(self.user_ids) rescue []
end
protected

View File

@ -1,32 +0,0 @@
<% # encoding: utf-8 %>
<% I18n.locale = @data.mail_content["lang"] %>
<!DOCTYPE html>
<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
</head>
<body bgcolor="#FFFFFF">
<div style="text-ident:20px">
</div>
<%= t('announcement.mail_hi') %> <br /><br />
<%= t('announcement.mail_url_view') %> <br /><br />
<a href="<%= @data.mail_content["url"] %>" target="_blank"> <%= @data.mail_content["title"] %> </a> <br /><br />
</div>
<span style="color:#555">--<br />
<%= t('announcement.mail_source') %> <a href="http://<%= @data.mail_content["host"] %>" target="_blank"> <%= @data.mail_content["site_title"] %> </a><br />
<%= t('announcement.mail_time') %> <%= DateTime.now %>
</span>
</body>
</html>

View File

@ -9,8 +9,7 @@
<%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %>
<%= javascript_include_tag "lib/modal-preview" %>
<%= javascript_include_tag "lib/file-type" %>
<%= javascript_include_tag "lib/module-area" %>
<%= javascript_include_tag "member-selection" %>
<%= javascript_include_tag "lib/module-area" %>
<% end %>
<%= f.error_messages %>
@ -33,11 +32,8 @@
<a href="#tag" data-toggle="tab"><%= t(:tags) %></a>
</li>
<li>
<a href="#imageupload" data-toggle="tab"><%= t("announcement.image") %></a>
<a href="#imageupload" data-toggle="tab"><%= t(:image) %></a>
</li>
<li>
<a href="#mail-group" data-toggle="tab"><%= t('announcement.email_reminder')%></a>
</li>
</ul>
<!-- Module -->
@ -68,6 +64,14 @@
<%= f.datetime_picker :deadline, :no_label => true %>
</div>
</div>
<!-- Promoter -->
<div class="control-group">
<label class="control-label muted"><%= t(:promoter) %></label>
<div class="controls">
<%= render partial: 'admin/member_selects/selection_box', locals: {field: 'bulletin[user_ids][]', users: @users} %>
</div>
</div>
</div>
@ -104,6 +108,7 @@
<% @tags.each do |tag| %>
<label class="checkbox inline btn <%= 'active' if @bulletin.tag_ids.include?(tag.id) %>">
<%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id) %> <%= tag.name %>
<%= hidden_field_tag 'bulletin[tag_ids][]', '' %>
</label>
<% end %>
</div>
@ -116,7 +121,7 @@
<!-- Images Upload -->
<div class="control-group">
<label class="control-label muted"><%= t("announcement.image") %></label>
<label class="control-label muted"><%= t(:image) %></label>
<div class="controls">
<div class="fileupload fileupload-new clearfix <%= 'fileupload-edit' if @bulletin.image.file %>" data-provides="fileupload">
<div class="fileupload-new thumbnail pull-left">
@ -139,52 +144,11 @@
</label>
</div>
</div>
<div class="image_note"><%= t("announcement.image_note")%></div>
</div>
</div>
</div>
<!-- Mail Group Module -->
<div class="tab-pane fade" id="mail-group">
<!-- Mail Group -->
<div class="control-group">
<label class="control-label muted"><%= t("announcement.email_to") %></label>
<div class="controls">
<label class="checkbox inline">
<%= check_box_tag('bulletin[email_sent]', '1', (!@bulletin.email_sent.blank? ? true : false), :id=>'remind-check') %><%= t('announcement.activate_email_reminder')%>
</label>
<div class="content-box">
<p>
<%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'bulletin[email_user_ids][]', users: @email_users} %>
</p>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label muted"></label>
<div class="controls">
<div class="content-box">
<span class="help-block"><%= "#{t("announcement.other_mailaddress")}(#{t("announcement.other_mailaddress_note")})"%> </span>
<%= f.text_area :other_mailaddress, :class=>"span12", :cols=>"25", :rows=>"10" %>
</div>
</div>
</div>
<div class="content-box">
<div class="control-group">
<label class="control-label muted"><%= t("announcement.email_sentdate") %></label>
<div class="controls">
<%= f.datetime_picker :email_sentdate, :no_label => true %>
</div>
</div>
</div>
</div>
</div>
<!-- Language Tabs -->
@ -242,10 +206,6 @@
<% end %>
<div class="control-group">
<div class="controls add-input"><%= t('announcement.append_note')%></div>
</div>
<!-- Link -->
<div class="control-group">
<label class="control-label muted"><%= t(:link) %></label>
@ -350,12 +310,6 @@
$(this).parents('.start-line').hide();
}
});
$('#remind-check').prop('checked') ? '':$('.content-box').addClass('hide')
$('#remind-check').on('change', function() {
$(this).prop('checked') ? $('.content-box').removeClass('hide'):$('.content-box').addClass('hide')
})
});
</script>
<% end %>

View File

@ -37,11 +37,6 @@
field type: 'tags',
hide: 'all',
sort: 'tags'
field db_field: 'email_user_ids',
hide: 'all',
translation: 'announcement.email_to',
display_option: '"<br />#{MailCron.get_send_group_mail(object.email_user_ids , object.other_mailaddress).join(" ").html_safe}"',
sort: 'email_user_ids'
field type: 'id',
db_field: 'update_user_id',
model: User,

View File

@ -32,4 +32,3 @@
</table>
<%= paginate( @bulletins, :param_name => :page_main, :params => {:inner => 'false'} ) rescue nil%>

View File

@ -8,6 +8,10 @@
<span><%= link_to unit,panel_announcement_front_end_index_bulletins_by_unit_path(:name=>unit) unless unit.blank? %></span>
</div>
</div>
<div class="news_image">
<%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
<%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %>
</div>
<div class="news_paragraph">
<%= @bulletin.text.html_safe rescue '' %>
</div>
@ -32,6 +36,21 @@
</div>
</div>
<% end %>
<% unless @bulletin.rss_link.blank? %>
<div>
<%= link_to t('ntu.rss_origin'), @bulletin.rss_link %>
</div>
<% end %>
</div>
<%= share_links(@bulletin, 'announcement') %>
<% unless @bulletin.user_ids.blank? %>
<div class="promoter">
<div>
<%= render partial: 'admin/member_selects/promoter_front', locals: {users: @bulletin.get_users} %>
</div>
</div>
<% end %>
<%= share_links(@bulletin, 'announcement') %>

View File

@ -4,7 +4,6 @@ en:
add_new: Add New
all_articles: All Articles
announcement: Announcement
append_note: Suggest to input underside Link and File's annotation to show correct info in frontend
approval_setting: Approval Setting
approve_bulletin_fail: Approval Fail
approve_bulletin_success: Approve Successfully
@ -26,8 +25,6 @@ en:
frontend:
bulletins: Announcement front-end
search_result: Search result
image: Cover image
image_note: The image will not show in content
link_name: Link Name
new_bulletin_category: New Bulletin Category
picture: Cover Picture
@ -39,15 +36,3 @@ en:
bulletins_and_web_links: Differential Nav.
index: Index
search: Search
email_reminder: Email Reminder
activate_email_reminder: Activate Email Reminder
email_sentdate: Email Time
email_to: Email To
mail_subject: this is an announcement reminder from【%{site_title}】
other_mailaddress: Other Email
other_mailaddress_note: Divide different email accounts with ","
mail_hi: Hi
mail_url_view: This email is the reminder of an announcement, please click the link for the details
mail_source: Source
mail_time: Time
image_upload_size_note: The following recommendations %{image_upload_size} upload size

View File

@ -4,7 +4,6 @@ zh_tw:
add_new: 新建
all_articles: 文章列表
announcement: 公告
append_note: 以下之附加連結與檔案,為使前台顯示名稱,建議您輸入註解。
approval_setting: 審核設定
approve_bulletin_fail: 審核失敗
approve_bulletin_success: 審核成功
@ -28,8 +27,6 @@ zh_tw:
frontend:
bulletins: 公告前台
search_result: 搜尋結果頁
image: 封面圖片
image_note: 此處上傳的圖片不會在公告內文出現
link_name: 連結名稱
new_bulletin_category: 新增公告類別
picture: 刊頭圖片
@ -42,15 +39,3 @@ zh_tw:
index: 索引
search: 搜尋
more: 更多+
email_reminder: 寄送提醒
activate_email_reminder: 開啟寄送提醒
email_sentdate: 寄送時間
email_to: 寄送對象
other_mailaddress: 其他Mail
other_mailaddress_note: 輸入多組mail時,請用","逗號隔開
mail_subject: 來自【%{site_title}】的公告事件提醒
mail_hi: 您好
mail_url_view: 此封信件為公告事件提醒,請點選以下連結詳細觀看
mail_source: 來源
mail_time: 時間
image_upload_size_note: 建議檔案小於%{image_upload_size}

View File

@ -41,10 +41,6 @@ Rails.application.routes.draw do
match "bulletins_side_bar" => "bulletins#bulletins_side_bar"
match "bulletins_search_block" => "bulletins#bulletins_search_block"
end
namespace :api do
get "categories_tags.json" => "bulletins#get_categories_tags"
get "bulletins.json" => "bulletins#get_bulletins"
end
end
end
end