diff --git a/app/views/seminars/con_upload.html.erb b/app/views/seminars/con_upload.html.erb
index c197961..8b7d1b6 100644
--- a/app/views/seminars/con_upload.html.erb
+++ b/app/views/seminars/con_upload.html.erb
@@ -9,9 +9,9 @@
data1 = @seminar.seminar_submission_field_sets.select{|v| v.field_name=='title'}[0]
data2 = @seminar.seminar_submission_field_sets.select{|v| v.field_name=='description'}[0]
data3 = @seminar.seminar_submission_field_sets.select{|v| v.field_name=='file'}[0]
- show1 = !(data1.disabled) rescue false
- show2 = !(data2.disabled) rescue false
- show3 = !(data3.disabled) rescue false
+ show1 = data1 ? !(data1.disabled) : false
+ show2 = data2 ? !(data2.disabled) : false
+ show3 = data3 ? !(data3.disabled) : false
name1 = data1['name'][I18n.locale]
name2 = data2['name'][I18n.locale]
name3 = data3['name'][I18n.locale]
@@ -22,7 +22,7 @@
prefix_url = OrbitHelper.url_to_show(@seminar.to_param)
end
%>
-<% if @seminar.contribute_start_date <= @time_now and ( @seminar.contribute_end_date.nil? or @seminar.contribute_end_date+1 >= @time_now ) %>
+<% if (@seminar.contribute_start_date.nil? || @seminar.contribute_start_date <= @time_now) && ( @seminar.contribute_end_date.nil? || @seminar.contribute_end_date+1 >= @time_now ) %>
<% begin %>
<% if !session[:seminar_signup_id].blank? %>
<%=t('seminar_signup.serial_number') %>: <%=@seminar_signup.display_serial_number rescue ""%>
diff --git a/config/list.yml b/config/list.yml
index 1e8330e..08d6cc4 100644
--- a/config/list.yml
+++ b/config/list.yml
@@ -45,3 +45,7 @@ markups:
ext_support: false
panel: typeF
display_only: seminar_submission_field
+ instructions:
+ muti_lang_input_supprt: false
+ ext_support: false
+ panel: typeG
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c316bfa..afd0711 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,7 +5,9 @@ en:
label: ""
lists:
markups:
- seminar_preferred_session: Preferred Session
+ seminar_preferred_session: Preferred Session
+ instructions: Instructions
+
restful_actions:
edit_seminar_review: Review
copy: Copy
@@ -46,12 +48,12 @@ en:
home_setting: Home Setting
sub_page_setting: Sub Page Setting
menu:
- introduction: Introduction
- news: News
- registration: Registration
- registered_participants: Registered Participants
- submission: Submission
- album: Album
+ introduction: Introduction
+ news: News
+ registration: Registration
+ registered_participants: Registered Participants
+ submission: Submission
+ album: Album
introduction: Introduction
announcement_limit: Announcement ;imit
album_limit: Album limit
@@ -160,7 +162,7 @@ en:
contribute_file_count: Count of Contribute Files #投稿檔案數
frontend:
- seminar: Semianr #研討會前台
+ seminar: Semianr #研討會前台
seminar_item:
new_item: New Item #新增項目
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index a31cc88..5ce9057 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -5,7 +5,8 @@ zh_tw:
label: ""
lists:
markups:
- seminar_preferred_session: Preferred Session
+ seminar_preferred_session: Preferred Session
+ instructions: "說明文字 Instructions"
restful_actions:
edit_seminar_review: 審查
@@ -47,12 +48,12 @@ zh_tw:
home_setting: 首頁設定
sub_page_setting: 內頁設定
menu:
- introduction: 介紹
- news: 公告
- registration: 註冊
- registered_participants: 註冊參與者
- submission: 投稿
- album: 相簿
+ introduction: 介紹
+ news: 公告
+ registration: 註冊
+ registered_participants: 註冊參與者
+ submission: 投稿
+ album: 相簿
introduction: 介紹
announcement_limit: 公告上限
album_limit: 相簿上限
@@ -161,7 +162,7 @@ zh_tw:
contribute_file_count: 投稿檔案數
frontend:
- seminar: 研討會前台
+ seminar: 研討會前台
seminar_item:
new_item: 新增項目
diff --git a/custom_announcement/app/helpers/custom_announcements_helper.rb b/custom_announcement/app/helpers/custom_announcements_helper.rb
index ec8b8b6..38b393f 100644
--- a/custom_announcement/app/helpers/custom_announcements_helper.rb
+++ b/custom_announcement/app/helpers/custom_announcements_helper.rb
@@ -320,9 +320,9 @@ module CustomAnnouncementsHelper
if @target_action == "index"
filename = overridehtml.nil? ? params[:layout_type] : overridehtml
f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', 'custom_announcement', "#{filename}.html.erb")
- if !File.exists?f
+ if !File.exist?(f)
f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', 'custom_announcement', "index.html.erb")
- if !File.exists?f
+ if !File.exist?(f)
return "
Maybe the administrator has changed the theme, please select the index page design again from the page settings.
".html_safe
end
end
@@ -333,7 +333,7 @@ module CustomAnnouncementsHelper
begin
data = @data# rescue nil
rescue Exception => e
- write_debug_file(e,'custom_announcements',@target_action) if Site::DEBUG
+ write_debug_file(e,'custom_announcements',@target_action) if Site::DEBUG
end
if !data.nil?
wrap_elements = doc.css("*[data-list][data-level='0']")
@@ -362,7 +362,7 @@ module CustomAnnouncementsHelper
else
filename = overridehtml.nil? ? @target_action : overridehtml
f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', 'custom_announcement', "#{filename}.html.erb")
- if File.exists?f
+ if File.exist?(f)
file = File.open(f)
doc = Nokogiri::HTML(file, nil, "UTF-8")
file.close
@@ -464,7 +464,7 @@ module CustomAnnouncementsHelper
layout_types = []
@key = Site.first.template
f = File.join("#{Rails.root}/app/templates/#{@key}/modules/#{module_app}/info.json")
- if File.exists?f
+ if File.exist?(f)
info = File.read(f)
hash = JSON.parse(info) rescue {}
frontends = hash["frontend"] || []
diff --git a/custom_announcement/lib/custom_announcement/engine.rb b/custom_announcement/lib/custom_announcement/engine.rb
index 96751f2..6834254 100644
--- a/custom_announcement/lib/custom_announcement/engine.rb
+++ b/custom_announcement/lib/custom_announcement/engine.rb
@@ -2,153 +2,155 @@ require "yaml"
module CustomAnnouncement
class Engine < ::Rails::Engine
initializer "custom_announcement" do
- begin
- translate_data = Dir["#{CustomAnnouncement::Engine.root}/config/locales/*.yml"] .map{|yaml_file| YAML.load(File.read(yaml_file))}
- data = {}
- key1 = {}
- key2 = {}
- key3 = {}
- key4 = {}
- key1_attr = []
- key2_attr = []
- key3_attr = []
- key4_attr = []
- data_item = {}
- key_item1 = {}
- key_item2 = {}
- key_item3 = {}
- value_item1 = {}
- value_item2 = {}
- value_item3 = {}
- value2_item1 = {}
- value2_item2 = {}
- key1_options = ['small_size','medium_size','orignal_size']
- key2_options = ['not_enable_tabs','enable_tabs_with_categories_include_all','enable_tabs_with_categories']
- key3_options = ['default','upper_left','lower_left','upper_right','lower_right']
- key4_options = ['the_same_as_data_count','display_all_in_other_tabs']
- key1_options.each_with_index do |k,i|
- key1_attr[i] = {}
- end
- key2_options.each_with_index do |k,i|
- key2_attr[i] = {}
- end
- key3_options.each_with_index do |k,i|
- key3_attr[i] = {}
- end
- key4_options.each_with_index do |k,i|
- key4_attr[i] = {}
- end
- translate_data.each do |t_data|
- v = t_data.values
- k = t_data.keys[0]
- key1[k] = v[0]['custom_announcement']['picture_showing_size']
- key2[k] = v[0]['custom_announcement']['tabs_options']
- key3[k] = v[0]['custom_announcement']['read_more_position_options']
- key4[k] = v[0]['custom_announcement']['all_tabs_setting']
- key1_options.each_with_index do |kk,i|
- key1_attr[i][k] = v[0]['custom_announcement'][kk]
- end
- key2_options.each_with_index do |kk,i|
- key2_attr[i][k] = v[0]['custom_announcement'][kk]
- end
- key3_options.each_with_index do |kk,i|
- key3_attr[i][k] = v[0]['custom_announcement'][kk]
- end
- key4_options.each_with_index do |kk,i|
- key4_attr[i][k] = v[0]['custom_announcement'][kk]
- end
- key_item1[k] = v[0]['custom_announcement']['showing_back_and_next']
- key_item2[k] = v[0]['custom_announcement']['enable_search']
- value_item1[k] = v[0]['custom_announcement']['not_show']
- value_item2[k] = v[0]['custom_announcement']['show_bottom']
- value_item3[k] = v[0]['custom_announcement']['show_top']
- value2_item1[k] = v[0]['custom_announcement']['no']
- value2_item2[k] = v[0]['custom_announcement']['yes']
- end
- data[key1] = key1_attr
- data[key2] = key2_attr
- data[key3] = key3_attr
- data[key4] = key4_attr
- data_item[key_item1] = [value_item1,value_item2,value_item3]
- data_item[key_item2] = [value2_item1,value2_item2]
- require File.expand_path('../../../app/models/custom_anns_cache', __FILE__)
- if defined? CustomAnnsCache
- CustomAnnsCache.destroy_all
- end
- rescue => e
- puts ['error in custom_announcement',e]
- end
- OrbitApp.registration "CustomAnnouncement", :type => "ModuleApp" do
- module_label "custom_announcement.custom_announcement"
- base_url File.expand_path File.dirname(__FILE__)
- widget_methods ["widget","random_custom_announcement_widget", "tag_cloud"]
- widget_settings [{"data_count"=>30,"enable_custom_widget_data"=>true}]
- taggable "CustomBulletin"
- categorizable
- authorizable
- frontend_enabled
- feeds_url "/xhr/custom_announcements/feeds"
- data_count 1..30
+ Rails.application.config.to_prepare do
begin
- show_options data
- show_option_items data_item
- rescue => e
- puts ['there_was_no_show_option_method',e]
+ translate_data = Dir["#{CustomAnnouncement::Engine.root}/config/locales/*.yml"] .map{|yaml_file| YAML.load(File.read(yaml_file))}
+ data = {}
+ key1 = {}
+ key2 = {}
+ key3 = {}
+ key4 = {}
+ key1_attr = []
+ key2_attr = []
+ key3_attr = []
+ key4_attr = []
+ data_item = {}
+ key_item1 = {}
+ key_item2 = {}
+ key_item3 = {}
+ value_item1 = {}
+ value_item2 = {}
+ value_item3 = {}
+ value2_item1 = {}
+ value2_item2 = {}
+ key1_options = ['small_size','medium_size','orignal_size']
+ key2_options = ['not_enable_tabs','enable_tabs_with_categories_include_all','enable_tabs_with_categories']
+ key3_options = ['default','upper_left','lower_left','upper_right','lower_right']
+ key4_options = ['the_same_as_data_count','display_all_in_other_tabs']
+ key1_options.each_with_index do |k,i|
+ key1_attr[i] = {}
+ end
+ key2_options.each_with_index do |k,i|
+ key2_attr[i] = {}
+ end
+ key3_options.each_with_index do |k,i|
+ key3_attr[i] = {}
+ end
+ key4_options.each_with_index do |k,i|
+ key4_attr[i] = {}
+ end
+ translate_data.each do |t_data|
+ v = t_data.values
+ k = t_data.keys[0]
+ key1[k] = v[0]['custom_announcement']['picture_showing_size']
+ key2[k] = v[0]['custom_announcement']['tabs_options']
+ key3[k] = v[0]['custom_announcement']['read_more_position_options']
+ key4[k] = v[0]['custom_announcement']['all_tabs_setting']
+ key1_options.each_with_index do |kk,i|
+ key1_attr[i][k] = v[0]['custom_announcement'][kk]
+ end
+ key2_options.each_with_index do |kk,i|
+ key2_attr[i][k] = v[0]['custom_announcement'][kk]
+ end
+ key3_options.each_with_index do |kk,i|
+ key3_attr[i][k] = v[0]['custom_announcement'][kk]
+ end
+ key4_options.each_with_index do |kk,i|
+ key4_attr[i][k] = v[0]['custom_announcement'][kk]
+ end
+ key_item1[k] = v[0]['custom_announcement']['showing_back_and_next']
+ key_item2[k] = v[0]['custom_announcement']['enable_search']
+ value_item1[k] = v[0]['custom_announcement']['not_show']
+ value_item2[k] = v[0]['custom_announcement']['show_bottom']
+ value_item3[k] = v[0]['custom_announcement']['show_top']
+ value2_item1[k] = v[0]['custom_announcement']['no']
+ value2_item2[k] = v[0]['custom_announcement']['yes']
+ end
+ data[key1] = key1_attr
+ data[key2] = key2_attr
+ data[key3] = key3_attr
+ data[key4] = key4_attr
+ data_item[key_item1] = [value_item1,value_item2,value_item3]
+ data_item[key_item2] = [value2_item1,value2_item2]
+ require File.expand_path('../../../app/models/custom_anns_cache', __FILE__)
+ if defined? CustomAnnsCache
+ CustomAnnsCache.destroy_all
+ end
+ rescue => e
+ puts ['error in custom_announcement',e]
end
- side_bar do
- set_sidebar_order(100) rescue nil
- head_label_i18n 'custom_announcement.custom_announcement', icon_class: "icon-bullhorn"
- available_for "users"
- active_for_controllers (['admin/custom_announcements'])
- head_link_path "admin_custom_announcements_path"
+ OrbitApp.registration "CustomAnnouncement", :type => "ModuleApp" do
+ module_label "custom_announcement.custom_announcement"
+ base_url File.expand_path File.dirname(__FILE__)
+ widget_methods ["widget","random_custom_announcement_widget", "tag_cloud"]
+ widget_settings [{"data_count"=>30,"enable_custom_widget_data"=>true}]
+ taggable "CustomBulletin"
+ categorizable
+ authorizable
+ frontend_enabled
+ feeds_url "/xhr/custom_announcements/feeds"
+ data_count 1..30
+ begin
+ show_options data
+ show_option_items data_item
+ rescue => e
+ puts ['there_was_no_show_option_method',e]
+ end
+ side_bar do
+ set_sidebar_order(100) rescue nil
+ head_label_i18n 'custom_announcement.custom_announcement', icon_class: "icon-bullhorn"
+ available_for "users"
+ active_for_controllers (['admin/custom_announcements'])
+ head_link_path "admin_custom_announcements_path"
+
+ context_link 'custom_announcement.all_articles',
+ :link_path=>"admin_custom_announcements_path" ,
+ :priority=>1,
+ :active_for_action=>{'admin/custom_announcements'=>'index'},
+ :available_for => 'users'
+ # context_link 'new_',
+ # :link_path=>"new_admin_custom_announcement_path" ,
+ # :priority=>2,
+ # :active_for_action=>{'admin/custom_announcements'=>'new'},
+ # :available_for => 'sub_managers'
+ context_link 'categories',
+ :link_path=>"admin_module_app_categories_path" ,
+ :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'custom_announcement').id}",
+ :priority=>3,
+ :active_for_action=>{'admin/custom_announcements'=>'categories'},
+ :active_for_category => 'CustomAnnouncement',
+ :available_for => 'managers'
+ context_link 'tags',
+ :link_path=>"admin_module_app_tags_path" ,
+ :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'custom_announcement').id}",
+ :priority=>4,
+ :active_for_action=>{'admin/custom_announcements'=>'tags'},
+ :active_for_tag => 'CustomAnnouncement',
+ :available_for => 'managers'
+ context_link 'custom_announcement.feed_list',
+ :link_path=>"admin_custom_announcement_feed_path" ,
+ :priority=>5,
+ :active_for_action=>{'admin/custom_announcements'=>'feed'},
+ :available_for => 'managers'
+ context_link 'custom_announcement.import',
+ :link_path=>"admin_custom_announcement_import_path" ,
+ :priority=>6,
+ :active_for_action=>{'admin/custom_announcements'=>'import'},
+ :available_for => 'managers'
+ context_link 'custom_announcement.settings',
+ :link_path=>"admin_custom_announcement_settings_path" ,
+ :priority=>6,
+ :active_for_action=>{'admin/custom_announcements'=>'settings'},
+ :available_for => 'managers'
+ end
- context_link 'custom_announcement.all_articles',
- :link_path=>"admin_custom_announcements_path" ,
- :priority=>1,
- :active_for_action=>{'admin/custom_announcements'=>'index'},
- :available_for => 'users'
- # context_link 'new_',
- # :link_path=>"new_admin_custom_announcement_path" ,
- # :priority=>2,
- # :active_for_action=>{'admin/custom_announcements'=>'new'},
- # :available_for => 'sub_managers'
- context_link 'categories',
- :link_path=>"admin_module_app_categories_path" ,
- :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'custom_announcement').id}",
- :priority=>3,
- :active_for_action=>{'admin/custom_announcements'=>'categories'},
- :active_for_category => 'CustomAnnouncement',
- :available_for => 'managers'
- context_link 'tags',
- :link_path=>"admin_module_app_tags_path" ,
- :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'custom_announcement').id}",
- :priority=>4,
- :active_for_action=>{'admin/custom_announcements'=>'tags'},
- :active_for_tag => 'CustomAnnouncement',
- :available_for => 'managers'
- context_link 'custom_announcement.feed_list',
- :link_path=>"admin_custom_announcement_feed_path" ,
- :priority=>5,
- :active_for_action=>{'admin/custom_announcements'=>'feed'},
- :available_for => 'managers'
- context_link 'custom_announcement.import',
- :link_path=>"admin_custom_announcement_import_path" ,
- :priority=>6,
- :active_for_action=>{'admin/custom_announcements'=>'import'},
- :available_for => 'managers'
- context_link 'custom_announcement.settings',
- :link_path=>"admin_custom_announcement_settings_path" ,
- :priority=>6,
- :active_for_action=>{'admin/custom_announcements'=>'settings'},
- :available_for => 'managers'
end
-
+ # temp = YAML.load_file(File.join(Rails.root,"config","mongoid.yml"))
+ # dbsettings = temp["production"]["sessions"]["default"]
+ # s = Moped::Session.new(dbsettings["hosts"])
+ # s.use dbsettings["database"]
+ # s[:custom_bulletins].indexes.create({expirable_created_at: 1},{ expireAfterSeconds: 180 })
end
- # temp = YAML.load_file(File.join(Rails.root,"config","mongoid.yml"))
- # dbsettings = temp["production"]["sessions"]["default"]
- # s = Moped::Session.new(dbsettings["hosts"])
- # s.use dbsettings["database"]
- # s[:custom_bulletins].indexes.create({expirable_created_at: 1},{ expireAfterSeconds: 180 })
end
end
end
\ No newline at end of file
diff --git a/custom_gallery/lib/custom_gallery/engine.rb b/custom_gallery/lib/custom_gallery/engine.rb
index a214a41..89ef129 100644
--- a/custom_gallery/lib/custom_gallery/engine.rb
+++ b/custom_gallery/lib/custom_gallery/engine.rb
@@ -1,94 +1,96 @@
module CustomGallery
class Engine < ::Rails::Engine
initializer "custom_gallery" do
- begin
- translate_data = Dir["#{CustomGallery::Engine.root}/config/locales/*.yml"] .map{|yaml_file| YAML.load(File.read(yaml_file))}
- data = {}
- key1 = {}
- value1 = {}
- value2 = {}
- value3 = {}
- translate_data.each do |t_data|
- v = t_data.values
- k = t_data.keys[0]
- key1[k] = v[0]['custom_gallery']['inner_page_layout']
- value1[k] = v[0]['custom_gallery']['grid_style']
- value2[k] = v[0]['custom_gallery']['card_style']
- value3[k] = v[0]['custom_gallery']['slideshow_style']
+ Rails.application.config.to_prepare do
+ begin
+ translate_data = Dir["#{CustomGallery::Engine.root}/config/locales/*.yml"] .map{|yaml_file| YAML.load(File.read(yaml_file))}
+ data = {}
+ key1 = {}
+ value1 = {}
+ value2 = {}
+ value3 = {}
+ translate_data.each do |t_data|
+ v = t_data.values
+ k = t_data.keys[0]
+ key1[k] = v[0]['custom_gallery']['inner_page_layout']
+ value1[k] = v[0]['custom_gallery']['grid_style']
+ value2[k] = v[0]['custom_gallery']['card_style']
+ value3[k] = v[0]['custom_gallery']['slideshow_style']
+ end
+ data[key1] = [value1,value2,value3]
+ rescue => e
+ puts ['error in custom_gallery',e]
end
- data[key1] = [value1,value2,value3]
- rescue => e
- puts ['error in custom_gallery',e]
- end
- require File.expand_path('../../../app/models/custom_album_setting', __FILE__)
- if defined?(CustomAlbumSetting)
- if CustomAlbumSetting.first.nil?
- CustomAlbumSetting.create()
- elsif CustomAlbumSetting.count > 1
- CustomAlbumSetting.all.to_a[1..-1].each do |custom_album_setting|
- custom_album_setting.destroy
+ require File.join(CustomGallery::Engine.root, 'app/models/custom_album_setting')
+ if defined?(CustomAlbumSetting)
+ if CustomAlbumSetting.first.nil?
+ CustomAlbumSetting.create()
+ elsif CustomAlbumSetting.count > 1
+ CustomAlbumSetting.all.to_a[1..-1].each do |custom_album_setting|
+ custom_album_setting.destroy
+ end
end
end
- end
-
- OrbitApp.registration "CustomGallery", :type => "ModuleApp" do
- module_label "custom_gallery.custom_gallery"
- base_url File.expand_path File.dirname(__FILE__)
- widget_methods ["widget","custom_album_widget"]
- # widget_settings []
- widget_settings [{"data_count"=>30,"enable_custom_widget_data"=>true}]
- models_to_cache [:custom_album,:custom_album_image]
- taggable "CustomAlbum"
- categorizable
- authorizable
- frontend_enabled
- data_count 1..30
- begin
- show_option_items data
- rescue => e
- puts ['there_was_no_show_option_method',e]
- end
- side_bar do
- set_sidebar_order(100) rescue nil
- head_label_i18n 'custom_gallery.custom_gallery', icon_class: "fa fa-file-image-o"
- available_for "users"
- active_for_controllers (['admin/custom_galleries','admin/images'])
- head_link_path "admin_custom_galleries_path"
+
+ OrbitApp.registration "CustomGallery", :type => "ModuleApp" do
+ module_label "custom_gallery.custom_gallery"
+ base_url File.expand_path File.dirname(__FILE__)
+ widget_methods ["widget","custom_album_widget"]
+ # widget_settings []
+ widget_settings [{"data_count"=>30,"enable_custom_widget_data"=>true}]
+ models_to_cache [:custom_album,:custom_album_image]
+ taggable "CustomAlbum"
+ categorizable
+ authorizable
+ frontend_enabled
+ data_count 1..30
+ begin
+ show_option_items data
+ rescue => e
+ puts ['there_was_no_show_option_method',e]
+ end
+ side_bar do
+ set_sidebar_order(100) rescue nil
+ head_label_i18n 'custom_gallery.custom_gallery', icon_class: "fa fa-file-image-o"
+ available_for "users"
+ active_for_controllers (['admin/custom_galleries','admin/images'])
+ head_link_path "admin_custom_galleries_path"
- context_link 'custom_gallery.all',
- :link_path=>"admin_custom_galleries_path" ,
- :priority=>1,
- :active_for_action=>{'admin/custom_galleries'=>"index"},
- :available_for => 'users'
+ context_link 'custom_gallery.all',
+ :link_path=>"admin_custom_galleries_path" ,
+ :priority=>1,
+ :active_for_action=>{'admin/custom_galleries'=>"index"},
+ :available_for => 'users'
- # context_link 'custom_gallery.new',
- # :link_path=>"new_admin_custom_gallery_path" ,
- # :priority=>2,
- # :active_for_action=>{'admin/custom_galleries'=>"new"},
- # :available_for => 'sub_managers'
+ # context_link 'custom_gallery.new',
+ # :link_path=>"new_admin_custom_gallery_path" ,
+ # :priority=>2,
+ # :active_for_action=>{'admin/custom_galleries'=>"new"},
+ # :available_for => 'sub_managers'
- context_link 'categories',
- :link_path=>"admin_module_app_categories_path" ,
- :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'custom_gallery').id}",
- :priority=>3,
- :active_for_action=>{'admin/custom_galleries'=>'categories'},
- :active_for_category => 'CustomGallery',
- :available_for => 'managers'
-
- context_link 'tags',
- :link_path=>"admin_module_app_tags_path" ,
- :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'custom_gallery').id}",
- :priority=>4,
- :active_for_action=>{'admin/custom_galleries'=>'tags'},
- :active_for_tag => 'CustomGallery',
- :available_for => 'managers'
- context_link 'setting',
- :link_path=>"admin_custom_galleries_setting_path" ,
- :priority=>5,
- :active_for_action=>{'admin/custom_galleries'=>'setting'},
- :available_for => 'managers'
- end
+ context_link 'categories',
+ :link_path=>"admin_module_app_categories_path" ,
+ :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'custom_gallery').id}",
+ :priority=>3,
+ :active_for_action=>{'admin/custom_galleries'=>'categories'},
+ :active_for_category => 'CustomGallery',
+ :available_for => 'managers'
+
+ context_link 'tags',
+ :link_path=>"admin_module_app_tags_path" ,
+ :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'custom_gallery').id}",
+ :priority=>4,
+ :active_for_action=>{'admin/custom_galleries'=>'tags'},
+ :active_for_tag => 'CustomGallery',
+ :available_for => 'managers'
+ context_link 'setting',
+ :link_path=>"admin_custom_galleries_setting_path" ,
+ :priority=>5,
+ :active_for_action=>{'admin/custom_galleries'=>'setting'},
+ :available_for => 'managers'
+ end
+ end
end
end
end
diff --git a/lib/seminar/engine.rb b/lib/seminar/engine.rb
index 394f173..ad434db 100644
--- a/lib/seminar/engine.rb
+++ b/lib/seminar/engine.rb
@@ -1,55 +1,56 @@
module Seminar
class Engine < ::Rails::Engine
- initializer "seminar" do
- OrbitApp.registration "Seminar", :type => "ModuleApp" do
- module_label "seminar.seminar"
- base_url File.expand_path File.dirname(__FILE__)
- authorizable
- categorizable
- frontend_enabled
- data_count 1..20
- widget_methods ["widget"]
- widget_settings [{"data_count"=>30}]
- side_bar do
- head_label_i18n 'seminar.seminar', icon_class: "icon-globe"
- available_for "users"
- active_for_controllers (['admin/seminars'])
- head_link_path "admin_seminars_path"
+ initializer "seminar" do
+ Rails.application.config.to_prepare do
+ OrbitApp.registration "Seminar", :type => "ModuleApp" do
+ module_label "seminar.seminar"
+ base_url File.expand_path File.dirname(__FILE__)
+ authorizable
+ categorizable
+ frontend_enabled
+ data_count 1..20
+ widget_methods ["widget"]
+ widget_settings [{"data_count"=>30}]
+ side_bar do
+ head_label_i18n 'seminar.seminar', icon_class: "icon-globe"
+ available_for "users"
+ active_for_controllers (['admin/seminars'])
+ head_link_path "admin_seminars_path"
- context_link 'list_',
- :link_path=>"admin_seminars_path" ,
- :priority=>1,
- :active_for_action=>{'admin/seminars'=>'index'},
- :available_for => 'users'
- context_link 'new_',
- :link_path=>"new_admin_seminar_path" ,
- :priority=>2,
- :active_for_action=>{'admin/seminars'=>'new'},
- :available_for => 'sub_managers'
- context_link 'categories',
- :link_path=>"admin_module_app_categories_path" ,
- :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'seminar').id}",
- :priority=>3,
- :active_for_action=>{'admin/seminars'=>'categories'},
- :active_for_category => 'Seminar',
- :available_for => 'managers'
- context_link 'seminar.set_seminar_items',
- :link_path=>"admin_seminar_items_path" ,
- :priority=>4,
- :active_for_action=>{'admin/seminars'=>'seminar_items'},
- :available_for => 'managers'
- context_link 'seminar.set_seminar_agreements',
- :link_path=>"admin_seminar_agreements_path" ,
- :priority=>5,
- :active_for_action=>{'admin/seminars'=>'seminar_agreements'},
- :available_for => 'managers'
- context_link 'seminar.enquiry_for_applicants',
- :link_path=>"admin_seminar_enquiry_for_applicants_path" ,
- :priority=>6,
- :active_for_action=>{'admin/seminars'=>'enquiry_for_applicants'},
- :available_for => 'users'
+ context_link 'list_',
+ :link_path=>"admin_seminars_path" ,
+ :priority=>1,
+ :active_for_action=>{'admin/seminars'=>'index'},
+ :available_for => 'users'
+ context_link 'new_',
+ :link_path=>"new_admin_seminar_path" ,
+ :priority=>2,
+ :active_for_action=>{'admin/seminars'=>'new'},
+ :available_for => 'sub_managers'
+ context_link 'categories',
+ :link_path=>"admin_module_app_categories_path" ,
+ :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'seminar').id}",
+ :priority=>3,
+ :active_for_action=>{'admin/seminars'=>'categories'},
+ :active_for_category => 'Seminar',
+ :available_for => 'managers'
+ context_link 'seminar.set_seminar_items',
+ :link_path=>"admin_seminar_items_path" ,
+ :priority=>4,
+ :active_for_action=>{'admin/seminars'=>'seminar_items'},
+ :available_for => 'managers'
+ context_link 'seminar.set_seminar_agreements',
+ :link_path=>"admin_seminar_agreements_path" ,
+ :priority=>5,
+ :active_for_action=>{'admin/seminars'=>'seminar_agreements'},
+ :available_for => 'managers'
+ context_link 'seminar.enquiry_for_applicants',
+ :link_path=>"admin_seminar_enquiry_for_applicants_path" ,
+ :priority=>6,
+ :active_for_action=>{'admin/seminars'=>'enquiry_for_applicants'},
+ :available_for => 'users'
+ end
end
-
end
end
end