diff --git a/config/list.yml b/config/list.yml
index a3b48cfc..e0fc1914 100644
--- a/config/list.yml
+++ b/config/list.yml
@@ -37,17 +37,18 @@ markups:
muti_lang_input_supprt: true
ext_support: true
-
+
public_r_tags:
- ad_banner
- sub_menu
- sitemap
-
+ - breadcrumb
+
page_part_kinds:
- text
- public_r_tag
- module_widget
-
+
widget_field:
- title
- category
@@ -57,7 +58,7 @@ widget_field:
- content
- link
- file
-
+
widget_field_type:
- title
- category
@@ -76,4 +77,4 @@ default_widget_style:
- style2
- style3
- style4
- - style5
\ No newline at end of file
+ - style5
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 68e299e1..cfd48348 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,7 +10,8 @@ en:
not_authed_user: Access Denied for you are not User for this app
object: Access Denied for you don't have permission for this object
not_admin: Access Denied for you are not Admin
- account_settings: Account settings
+ account_settings: Account settings
+ academic_info: Academic Info.
action: Action
ad:
chinese_1: 在套圖中出現次數 1次請輸入1
@@ -40,8 +41,8 @@ en:
add_attribute_field: Add attribute field
add_image: Add image
add_item: Add item
- add_member: Add member
- add_more: Add more
+ add_member: Create New Member
+ add_more: Exteudable Field
address_modal:
default_title: Address
street_address: Street address
@@ -55,7 +56,7 @@ en:
all: All
all_content: All Content
all_file: All File
- all_member: All Member
+ all_member: Member List
all_plugin_summary: All plugin summary
all_plugins: All plugins
always_display_title: Always displayed in the title bar
@@ -126,20 +127,20 @@ en:
paper: Paper was successfully created.
user: User was successfully created.
create_: Create
- cross_lang: 跨語言輸入
+ cross_lang: Enable Monolingual
data: Data
date:
- calendar: 紀年法
- range: 本欄為時間區段
+ calendar: Calendar Era
+ range: Enable Time Period
format: 格式
- tw_calendar: 民國
+ tw_calendar: R.O.C Year.
minguo_calendar:
after: 民國
before: 民前
first_year: 民國元年
- year: 年
- month: 月
- west_calendar: 西元
+ year: Year
+ month: Month
+ west_calendar: A.C.
date_: Date
dashboard:
bulletin: Announcement
@@ -177,6 +178,7 @@ en:
end_date: End date
errors:
at_least_one: must at least have one value
+ field: Fields
file:
size: File size
type: File type
@@ -188,6 +190,7 @@ en:
frequency: Frequency
frontend_data_count: Frontend data count
gallery: Gallery
+ groups: Groups
help: Help
hidden: Hidden
hide: Hide
@@ -198,13 +201,13 @@ en:
image: Image
images: Images
info: Information
- initial: 起始值
+ initial: Default Value
intro: Introduction
is_published: Is published
item: Item
- item_name: Item name
+ item_name: Name
javascripts: Javascripts
- key: Key
+ key: Index Keys
last_modified: Last modified
layout: Layout
link: Link
@@ -247,6 +250,10 @@ en:
markup_value: Markup value
me: Me
member: Member
+ member_authorization: Authorizations
+ member_info: Profile Form
+ member_registration: Registration Approval
+ member_role: Member Roles
menu_enabled_for: Menu enabled for
module: Module
module_authorization: Module Authorization
@@ -265,7 +272,8 @@ en:
page: New page
user: New user
info: New user information
- role: New user role
+ role: New role
+ sub_role: New sub role
new_: New
news: News
no_: "No"
@@ -291,7 +299,7 @@ en:
password_current: Current password
pending: Pending
picture: Picture
- placeholder: Placeholder
+ placeholder: Field Hint
plugins: Plugins
postdate: Postdate
posted_by: Posted by
@@ -310,6 +318,7 @@ en:
rejected_reason_empty: "Approval rejected, no referencable information"
related_links: Related Links
role: Role
+ role_field: Role Field
Roles: Roles
ruling_site: Ruling Site
search:
@@ -355,6 +364,8 @@ en:
status: Status
structure: Structure
sub_manager: SubManager
+ sub_role: Sub Role
+ sub_role_field: Sub Role Field
subtitle: Subtitle
submit: Submit
submit_approval: Submit approval
@@ -376,10 +387,11 @@ en:
theme: Theme
themes: Themes
title: Title
+ to_search: Set as Search Key
top: Top
total_visitors: Total Visitors
traffic: Traffic
- type: Type
+ type: Field Type
unit_name: Unit name
unzip_success: "App unzip procress is finished, please restart the server to apply effect"
up_to_date: Up-to-date
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 4023b466..768c52e5 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -20,6 +20,7 @@ zh_tw:
object: 拒絕存取，因你沒有權限
not_admin: 拒絕存取，因你不是此應用程式管理員
account_settings: 帳號設定
+ academic_info: 學術資訊
action: 操作
ad:
ab_fx: 轉場效果
@@ -37,13 +38,26 @@ zh_tw:
widget_info_for_ad_image_size: "此區塊圖片尺寸使用: %{best_size}"
ad_banner: 廣告輪播
add: 新增
+ add_attribute_field: 新增欄位
+ add_image: Add image
add_item: 新增項目
+ add_member: 新增成員
+ add_more: 可擴充欄位
+ address_modal:
+ default_title: 地址
+ street_address: 街道地址
+ city: 城市
+ county: 縣市
+ zip: 郵遞區號
+ country: 國家/地區
addthis_tools:
add_to_bookmark: 加入書籤
admin: 管理員
all_content: 所有內容
all_file: 所有檔案
- all_member: 所有會員
+ all_member: 成員列表
+ all_plugin_summary: All plugin summary
+ all_plugins: All plugins
always_display_title: 永遠顯示標題
app_auth:
list_setting_result: 授權列表
@@ -103,7 +117,21 @@ zh_tw:
page: 頁面已成功建立
user: 使用者已成功建立
create_: 建立
+ cross_lang: 啟用單語系
data: 資料
+ date:
+ calendar: 紀年法
+ range: 時間區段設定
+ format: 格式
+ tw_calendar: 民國
+ minguo_calendar:
+ after: 民國
+ before: 民前
+ first_year: 民國元年
+ year: 年
+ month: 月
+ west_calendar: 西元
+ date_: Date
dashboard:
bulletin: 公告
news_bulletin: 新聞
@@ -162,6 +190,7 @@ zh_tw:
end_date: 結束日期
errors:
at_least_one: 至少擁有一個值
+ field: 欄位
file:
size: 檔案大小
type: 檔案類型
@@ -170,6 +199,9 @@ zh_tw:
file_type: 檔案類型
forgot_password: 忘記密碼?
frequency: 頻率
+ frontend_data_count: Frontend data count
+ gallery: Gallery
+ groups: 群組
help: 幫助
hidden: 隱藏的
hide: 隱藏
@@ -178,10 +210,14 @@ zh_tw:
horizontal: 水平的
hot: 熱門
image: 圖片
- info: 信息
+ images: Images
+ info: 基本資料
+ initial: 預設值
intro: 簡介
is_published: 已發佈
item: 項目
+ item_name: 名稱
+ javascripts: Javascripts
key: 索引
last_modified: 最後修改者
layout: 範本
@@ -229,8 +265,15 @@ zh_tw:
user_name: 電子郵件帳號
manager: 管理者
manager: 管理者
+ markup: 輸入模式
+ markup_options: Markup options
+ markup_value: Markup value
me: 我
- member: 會員
+ member: 成員
+ member_authorization: 成員權限
+ member_info: 基本資料表
+ member_registration: 註冊審核
+ member_role: 身份欄位
menu_enabled_for: 選單啟用
modal:
close: 關閉
@@ -251,7 +294,9 @@ zh_tw:
page: 新增頁面
user: 新增使用者
info: 新增使用者資訊
- role: 新增使用者角色
+ role: 新增身份
+ sub_role: 新增子身份
+ new_: New
news: 新聞
no_: "不是"
no_deadline: 沒有期限
@@ -276,6 +321,8 @@ zh_tw:
password_current: 目前的密碼
pending: 待審核
picture: 圖片
+ placeholder: 欄位提示文字
+ plugins: Plugins
postdate: 張貼日期
posted_by: 張貼人
preview: 預覽
@@ -290,9 +337,9 @@ zh_tw:
rejected_reason: '拒絕原因:'
rejected_reason_empty: "拒絕核准, 沒有參考資訊"
related_links: 相關連結
- remember_me: 記住我
- role: 角色
- Roles: 角色
+ role: 身份
+ role_field: 身份欄位
+ roles: 身份
ruling_site: 銳綸網站
search:
domains: Google Search Domains
@@ -333,6 +380,8 @@ zh_tw:
status: 狀態
structure: 結構
sub_manager: 次管理員
+ sub_role: 子身份
+ sub_role_field: 子身份欄位
subtitle: 副標題
submit: 送出
submit_approval: 送出已核准
@@ -353,10 +402,11 @@ zh_tw:
theme: 套用頁面樣式
themes: 主題
title: 標題
+ to_search: 加入搜尋條件
top: 置頂
total_visitors: 總計造訪人次
traffic: 流量
- type: 類型
+ type: 欄位類型
unit_name: 單位名稱
up_to_date: 最新版本
update:
diff --git a/config/routes.rb b/config/routes.rb
index c9e77b6b..cc272ffc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -209,11 +209,6 @@ Orbit::Application.routes.draw do
match 'desktop_publications/books_list'=>'desktop_publications#books_list'
match 'desktop_publications/books_add'=>'desktop_publications#books_add'
- match 'desktop_publications/conference_p' => 'desktop_publications#conference_p'
- match 'desktop_publications/conference_p_list/'=>'desktop_publications#conference_p_list'
- match 'desktop_publications/conference_p_add/'=>'desktop_publications#conference_p_add'
- # end
-
# namespace :desktop_research do
match 'desktop_research/research_d' => 'desktop_research#research_d'
match 'desktop_research/research_d_list/' => 'desktop_research#research_d_list'
@@ -255,7 +250,7 @@ Orbit::Application.routes.draw do
end
end
- controller_paths :front, %w[show_banner show_footer show_menu show_page_sub_menu show_site_sub_menu show_sitemap]
+ controller_paths :front, %w[show_breadcrumb show_banner show_footer show_menu show_page_sub_menu show_site_sub_menu show_sitemap]
# controller_paths :mobile, %w[index announcement announcement_content dialog_contact dialog_copyright dialog_language map page page_content]
# scope 'app' do
@@ -274,7 +269,9 @@ Orbit::Application.routes.draw do
root :to => 'mobile#index', :as => 'mobile'
end
-
+ match '/panel/orbit_app/widget/:type' => 'pages#index_from_link', :constraints => lambda { |request|
+ request.query_string.include?("same_page_id=")
+ }
match '/panel/orbit_app/widget/:type' => 'default_widget#default_widget'
diff --git a/db/seeds.rb b/db/seeds.rb
index 60788465..a0458dd1 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -6,28 +6,53 @@ FactoryGirl.definition_file_paths = Dir["#{Rails.root}/vendor/built_in_modules/*
FactoryGirl.find_definitions
-CoAuthorRelation.destroy_all
-CoAuthor.destroy_all
-JournalLevelType.destroy_all
-WritingJournalFile.destroy_all
-WritingJournal.destroy_all
+ConferenceCoAuthorRelation.destroy_all
+ConferenceCoAuthor.destroy_all
+ConferencePaperType.destroy_all
+WritingConferenceFile.destroy_all
+WritingConference.destroy_all
#Dir[Rails.root.join("spec/factories/*.rb")].each {|f| require f}
-10.size.times do
- FactoryGirl.create(:journal_level)
+2.times do
+ FactoryGirl.create(:conference_paper_type)
end
10.times do
- FactoryGirl.create(:relations)
+ FactoryGirl.create(:conference_co_author_relation)
end
50.times do
- FactoryGirl.create(:paper_record)
+ FactoryGirl.create(:conference_co_author)
end
50.times do
- FactoryGirl.create(:co_author_candidate)
+ FactoryGirl.create(:writing_conference)
end
puts "Success!"
+
+# =======
+#
+#CoAuthorRelation.destroy_all
+#CoAuthor.destroy_all
+#JournalLevelType.destroy_all
+#WritingJournalFile.destroy_all
+#WritingJournal.destroy_all
+#
+#10.size.times do
+# FactoryGirl.create(:journal_level)
+#end
+#
+#10.times do
+# FactoryGirl.create(:journal_relation)
+#end
+#
+#50.times do
+# FactoryGirl.create(:journal)
+#end
+#
+#50.times do
+# FactoryGirl.create(:journal_co_author)
+#end
+#puts "Success!"
diff --git a/lib/orbit_app/plugin/registration.rb b/lib/orbit_app/plugin/registration.rb
index 1a6f63f3..126faf34 100644
--- a/lib/orbit_app/plugin/registration.rb
+++ b/lib/orbit_app/plugin/registration.rb
@@ -47,9 +47,11 @@ module OrbitApp
@base_path = args[0][:base_path]
@name = partial[0][:i18n].nil? ? name : lambda{ I18n.t(partial[0][:i18n]) }
@partial_path = ''
+ @admin_partial_path = ''
unless partial.nil?
@partial_path = partial[0][:path]
+ @admin_partial_path = partial[0][:admin_path]
end
block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
@@ -58,6 +60,10 @@ module OrbitApp
def profile_partial_path
return @partial_path
end
+
+ def admin_partial_path
+ return @admin_partial_path
+ end
end
end
diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb
index d0c1eab6..a26fe696 100644
--- a/lib/parsers/parser_back_end.rb
+++ b/lib/parsers/parser_back_end.rb
@@ -30,6 +30,7 @@ module ParserBackEnd
parse_images_edit(body, page)
parse_footer_edit(body, page)
parse_sub_menu_edit(body, page)
+ parse_breadcrumb_edit(body, page)
parse_counter_edit(body)
public_r_tags.each do |tag|
send("parse_#{tag}s_edit", body, page, true)
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index d6bafdd3..7d858686 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -144,6 +144,32 @@ module ParserCommon
end
end
+ # breadcrumb
+ def parse_breadcrumbs_edit(body = nil, page = nil, edit=nil)
+ body.css('breadcrumb').each do |breadcrumb|
+ ancestors = Page.find(page.id).ancestors_and_self rescue nil
+ ancestors = nil if ancestors.size == 1
+ res = ''
+ if ancestors
+ res << "
"
+ ancestors.each_with_index do |node, i|
+ last = i == ancestors.size-1
+ res << "- "
+ if last
+ res << node.title
+ else
+ res << "#{node.title}"
+ res << "/"
+ end
+ res << "
"
+ end
+ res << "
"
+ end
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
+ breadcrumb.swap(fragment)
+ end
+ end
+
# page_footer
def parse_footer_edit(body, page)
page_footer = body.css('.page_footer').first
@@ -172,10 +198,23 @@ module ParserCommon
end
end
+ def parse_breadcrumb_edit(body, page)
+ page_breadcrumb = body.css('.page_breadcrumb').first
+ if page_breadcrumb
+ res = "
"
+ res << @site.breadcrumb rescue nil
+ res << "
"
+ fragment = Nokogiri::HTML::DocumentFragment.new(body ,res)
+ page_breadcrumb.swap(fragment) rescue nil
+ else
+ ''
+ end
+ end
+
# sitemap
def parse_sitemaps_edit(body = nil, page = nil, edit=nil)
sitemap = body.css('sitemap').first
- url = admin_site_sitemap_frontend_path(@site)
+ url = front_show_sitemap_path
options = "?inner=true"
fragment = Nokogiri::HTML::DocumentFragment.new(body, "
")
sitemap.swap(fragment)
@@ -219,7 +258,7 @@ module ParserCommon
raise ModuleAppError,"PagePart can't find ModuleApp" if part.module_app.nil?
"/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true"
end
- options = "&part_id=#{part.id}&category_id=#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=#{!part[:tag].blank? ? part[:tag] : tag}&page=#{params[:page]}&search_query=#{params[:search_query]}&part_title=#{Rack::Utils.escape(part_title).gsub("+", "%20") rescue nil}&item_type=page_part"
+ options = "&part_id=#{part.id}&category_id=#{!part[:category].blank? ? part[:category] : category}&tag_id=#{!part[:tag].blank? ? part[:tag] : tag}&page=#{params[:page]}&search_query=#{params[:search_query]}&part_title=#{Rack::Utils.escape(part_title).gsub("+", "%20") rescue nil}&item_type=page_part"
ret << "
"
when 'public_r_tag'
ret << "
"
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index c4f644b0..2ab10cdd 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -11,6 +11,7 @@ module ParserFrontEnd
parse_images(body, page)
parse_menu(body, page)
parse_sub_menu(body, page, site)
+ parse_breadcrumb(body, page, site)
parse_counter(body)
i18n.merge!({locale => body.to_html})
end
@@ -18,8 +19,8 @@ module ParserFrontEnd
end
def parse_page_content(page)
- category = params[:category_id].blank? ? page[:category] : params[:category_id]
tag = params[:tag_id].blank? ? page[:tag] : params[:tag_id]
+ category = params[:category_id].blank? ? page[:category] : params[:category_id]
body = Nokogiri::HTML(page.content)
body.css('orbit_front').each do |front|
if front['value']
@@ -92,6 +93,18 @@ module ParserFrontEnd
end
end
+ # page_breadcrumb
+ def parse_breadcrumb(body, page, site)
+ page_breadcrumb = body.css('.page_breadcrumb').first
+ if page_breadcrumb
+ res = "
"
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
+ page_breadcrumb.swap(fragment)
+ else
+ ''
+ end
+ end
+
# page_contents
def parse_contents(body, page, edit=nil, locale)
public_r_tags = []
@@ -101,6 +114,7 @@ module ParserFrontEnd
if (content["main"] == "true" && !page.module_app.nil?)
if page.app_frontend_url == 'default_widget'
url = "/panel/orbit_app/widget/#{page.frontend_style}?inner=true"
+ url << "&id=\#{params[:id] if params[:id] && !params[:id].eql?(page.id.to_s)}"
else
url = "/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}\#{(\"/\" + params[:id]) if params[:id] && !params[:id].eql?(page.id.to_s)}\#{(\"/\" + params[:controller_action]) if params[:controller_action] && params[:id]}?inner=true"
end
@@ -123,9 +137,7 @@ module ParserFrontEnd
else
"/panel/\#{part.module_app.key}/widget/\#{part.widget_path}?inner=true"
end
-
- options = "&part_id=\#{part.id}&category_id=\#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=\#{!part[:tag].blank? ? part[:tag] : tag}&page=\#{params[:page]}&search_query=\#{params[:search_query]}&part_title=\#{Rack::Utils.escape(part_title).gsub(\"\+\", \"\%20\") rescue nil}&item_type=page_part"
-
+ options = "&part_id=\#{part.id}&category_id=\#{part[:category]}&tag_id=\#{part[:tag]}&page=\#{params[:page]}&search_query=\#{params[:search_query]}&part_title=\#{Rack::Utils.escape(part_title).gsub(\"\+\", \"\%20\") rescue nil}&item_type=page_part"
ret << "
"
when 'public_r_tag'
@@ -178,5 +190,9 @@ module ParserFrontEnd
def generate_sub_menus(*args)
"
"
end
-
+
+ # breadcrumb
+ def generate_breadcrumbs(*args)
+ "
"
+ end
end
diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake
index 9770f151..c448eed7 100644
--- a/lib/tasks/migrate.rake
+++ b/lib/tasks/migrate.rake
@@ -1,313 +1,10 @@
# encoding: utf-8
namespace :migrate do
-
- task :i18n => :environment do
-
- p 'Start Bulletin'
- bulletins = Bulletin.admin_manager_all
- i = 1
- bulletins.each do |bulletin|
- p "#{i}/#{bulletins.size} - #{bulletin.id}"
- title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => bulletin.id, :language_value_type => bulletin.class})
- bulletin.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- subtitle = I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => bulletin.id, :language_value_type => bulletin.class})
- bulletin.subtitle_translations = {'en' => subtitle['en'], 'zh_tw' => subtitle['zh_tw']} if subtitle
- text = I18nVariable.first(:conditions => {:key => 'text', :language_value_id => bulletin.id, :language_value_type => bulletin.class})
- bulletin.text_translations = {'en' => text['en'], 'zh_tw' => text['zh_tw']} if text
- p bulletin.save(:validate => false)
- i += 1
- end
- p 'End Bulletin'
-
- p '====================================================='
-
- p 'Start BulletinCategory'
- categories = BulletinCategory.admin_manager_all
- i = 1
- categories.each do |category|
- p "#{i}/#{categories.size} - #{category.id}"
- title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class})
- category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p category.save(:validate => false)
- i += 1
- end
- p 'End BulletinCategory'
-
- p '====================================================='
-
- p 'Start BulletinFile'
- files = BulletinFile.all
- i = 1
- files.each do |file|
- p "#{i}/#{files.size} - #{file.id}"
- description = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class})
- file.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description
- title = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class})
- file.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p file.save(:validate => false)
- i += 1
- end
- p 'End BulletinFile'
-
- p '====================================================='
-
- p 'Start BulletinLink'
- links = BulletinLink.all
- i = 1
- links.each do |link|
- p "#{i}/#{links.size} - #{link.id}"
- title = I18nVariable.first(:conditions => {:language_value_id => link.id, :language_value_type => link.class})
- link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p link.save(:validate => false)
- i += 1
- end
- p 'End BulletinLink'
-
- p '====================================================='
-
- p 'Start UnitListForAnc'
- units = UnitListForAnc.all
- i = 1
- units.each do |unit|
- p "#{i}/#{units.size} - #{unit.id}"
- title = I18nVariable.first(:conditions => {:language_value_id => unit.id, :language_value_type => unit.class})
- unit.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p unit.save(:validate => false)
- i += 1
- end
- p 'End UnitListForAnc'
-
- p '====================================================='
- p '====================================================='
-
- p 'Start PageContext'
- page_contexts = PageContext.all
- i = 1
- page_contexts.each do |page_context|
- p "#{i}/#{page_contexts.size} - #{page_context.id}"
- context = I18nVariable.first(:conditions => {:language_value_id => page_context.id, :language_value_type => page_context.class})
- page_context.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context
- p page_context.save(:validate => false)
- i += 1
- end
- p 'End PageContext'
-
- p '====================================================='
- p '====================================================='
-
- p 'Start WebLink'
- links = WebLink.all
- i = 1
- links.each do |link|
- p "#{i}/#{links.size} - #{link.id}"
- # the original key was 'name'
- title = I18nVariable.first(:conditions => {:key => 'name', :language_value_id => link.id, :language_value_type => link.class})
- link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- context = I18nVariable.first(:conditions => {:key => 'context', :language_value_id => link.id, :language_value_type => link.class})
- link.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context
- p link.save(:validate => false)
- i += 1
- end
- p 'End WebLink'
-
- p '====================================================='
-
- p 'Start WebLinkCategory'
- categories = WebLinkCategory.admin_manager_all
- i = 1
- categories.each do |category|
- p "#{i}/#{categories.size} - #{category.id}"
- title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class})
- category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p category.save(:validate => false)
- i += 1
- end
- p 'End WebLinkCategory'
-
- p '====================================================='
- p '====================================================='
-
- p 'Start Meta'
- metas = Meta.all
- i = 1
- metas.each do |meta|
- p "#{i}/#{metas.size} - #{meta.id}"
- title = I18nVariable.first(:conditions => {:language_value_id => meta.id, :language_value_type => meta.class})
- meta.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p meta.save(:validate => false)
- i += 1
- end
- p 'End Meta'
-
- p '====================================================='
- p '====================================================='
-
- p 'Start Attribute'
- attributes = Attribute.all
- i = 1
- attributes.each do |attribute|
- p "#{i}/#{attributes.size} - #{attribute.id}"
- title = I18nVariable.first(:conditions => {:language_value_id => attribute.id, :language_value_type => attribute.class})
- attribute.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p attribute.save(:validate => false)
- i += 1
- end
- p 'End Attribute'
-
- p '====================================================='
-
- p 'Start AttributeField'
- attribute_fields = AttributeField.all
- i = 1
- attribute_fields.each do |attribute_field|
- p "#{i}/#{attribute_fields.size} - #{attribute_field.id}"
- title = I18nVariable.first(:conditions => {:language_value_id => attribute_field.id, :language_value_type => attribute_field.class})
- attribute_field.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p attribute_field.save(:validate => false)
- i += 1
- end
- p 'End AttributeField'
-
- p '====================================================='
-
- p 'Start Role'
- roles = Role.all
- i = 1
- roles.each do |role|
- p "#{i}/#{roles.size} - #{role.id}"
- title = I18nVariable.first(:conditions => {:language_value_id => role.id, :language_value_type => role.class})
- role.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p role.save(:validate => false)
- i += 1
- end
- p 'End Role'
-
- p '====================================================='
- p '====================================================='
-
- p 'Start AdImage'
- ad_images = AdImage.all
- i = 1
- ad_images.each do |image|
- p "#{i}/#{ad_images.size} - #{image.id}"
- # no key is set and title = context, this is due to original error in the code
- title = I18nVariable.first(:conditions => {:language_value_id => image.id, :language_value_type => image.class})
- image.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- image.context_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p image.save(:validate => false)
- i += 1
- end
- p 'End AdImage'
-
- p '====================================================='
- p '====================================================='
-
- p 'Start Asset'
- assets = Asset.all
- i = 1
- assets.each do |asset|
- p "#{i}/#{assets.size} - #{asset.id}"
- title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => asset.id, :language_value_type => asset.class})
- asset.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- description = I18nVariable.first(:conditions => {:key => 'description', :language_value_id => asset.id, :language_value_type => asset.class})
- asset.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description
- p asset.save(:validate => false)
- i += 1
- end
- p 'End Asset'
-
- p '====================================================='
-
- p 'Start AssetCategory'
- categories = AssetCategory.all
- i = 1
- categories.each do |category|
- p "#{i}/#{categories.size} - #{category.id}"
- title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class})
- category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p category.save(:validate => false)
- i += 1
- end
- p 'End AssetCategory'
-
- p '====================================================='
- p '====================================================='
-
- p 'Start Item'
- items = Item.all
- i = 1
- items.each do |item|
- p "#{i}/#{items.size} - #{item.id}"
- title = I18nVariable.first(:conditions => {:language_value_id => item.id, :language_value_type => item.class})
- item.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p item.save(:validate => false)
- i += 1
- end
- p 'End Item'
-
- p '====================================================='
-
- p 'Start Page'
- pages = Page.all
- i = 1
- pages.each do |item|
- p "#{i}/#{pages.size} - #{item.id}"
- # the key was originally 'title', changed to 'page_title' to avoit conflict with parent
- title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => item.id, :language_value_type => item.class})
- item.page_title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- p item.save(:validate => false)
- i += 1
- end
- p 'End Page'
-
- p '====================================================='
-
- p 'Start PagePart'
- page_parts = PagePart.all
- i = 1
- page_parts.each do |part|
- p "#{i}/#{page_parts.size} - #{part.id}"
- title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => part.id, :language_value_type => part.class})
- part.page_title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- content = I18nVariable.first(:conditions => {:key => 'i18n_variable', :language_value_id => part.id, :language_value_type => part.class})
- part.content_translations = {'en' => content['en'], 'zh_tw' => content['zh_tw']} if content
- p part.save(:validate => false)
- i += 1
- end
- p 'End PagePart'
-
- p '====================================================='
- p '====================================================='
-
- p 'Start Site'
- site = Site.first
- title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => site.id, :language_value_type => site.class})
- site.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title
- footer = I18nVariable.first(:conditions => {:key => 'footer', :language_value_id => site.id, :language_value_type => site.class})
- site.footer_translations = {'en' => footer['en'], 'zh_tw' => footer['zh_tw']} if footer
- sub_menu = I18nVariable.first(:conditions => {:key => 'sub_menu', :language_value_id => site.id, :language_value_type => site.class})
- site.sub_menu_translations = {'en' => sub_menu['en'], 'zh_tw' => sub_menu['zh_tw']} if sub_menu
- p site.save(:validate => false)
- p 'End Site'
-
- end
-
-
- task :news_p => :environment do
- news_bulletins = NewsBulletin.admin_manager_all rescue nil
- i = 1
- news_bulletins.each do |news|
- p "#{i}/#{news_bulletins.size} - #{news.id}"
- news.subtitle_translations = {'en' => (news.subtitle_translations['en'].gsub(/^\
/, '').gsub(/\<\/p\>$/, '') rescue ''), 'zh_tw' => (news.subtitle_translations['zh_tw'].gsub(/^\/, '').gsub(/\<\/p\>$/, '') rescue nil)}
- p news.save(:validate => false) if news.changed?
- i += 1
- end if news_bulletins
- end
task :sitemap_i18n => :environment do
Item.all.each do |item|
- item.sitemap_enabled = item.sitemap_enabled ? {'en' => 'true', 'zh_tw' => 'true'} : nil
+ item.sitemap_enabled = item.sitemap_enabled ? {'en' => 'true', 'zh_tw' => 'true'} : {}
item.save
end
end
@@ -448,7 +145,7 @@ namespace :migrate do
PagePart.all.each do |pp|
pp[:backup_module_app_key] = (pp.module_app ? pp.module_app.key : nil)
- puts pp.id
+ # puts pp.id
pp.save
# puts pp.inspect
end
@@ -493,6 +190,7 @@ namespace :migrate do
end
end
+
task :convert_cate_tag_type => :environment do
[Page,PagePart].each do |obj|
obj.all.each do |pp|
@@ -510,6 +208,30 @@ namespace :migrate do
pp.save
end
end
+
+ task :clean_parts => :environment do
+ PagePart.where(widget_style: /\d/, kind: 'module_widget').each{|part| part.update_attributes({kind: 'text', widget_style: nil, widget_field: nil})}
+ PagePart.where(widget_style: /\d/).each{|part| part.update_attributes({widget_style: nil, widget_field: nil})}
+ end
+
+ task :delete_import_archive => :environment do
+ categories = ArchiveFileCategory.where(key: /import_/).entries
+ unless categories.blank?
+ categories.each do |category|
+ files = category.archive_files
+ unless files.blank?
+ files.each(&:destroy)
+ end
+ category.destroy
+ end
+ end
+ end
+
+ task :save_pages => :environment do
+ Page.all.each do |page|
+ page.save
+ end
+
end
end
diff --git a/lib/tasks/pages.rake b/lib/tasks/pages.rake
index 598d4b53..8f5d5f8a 100644
--- a/lib/tasks/pages.rake
+++ b/lib/tasks/pages.rake
@@ -4,7 +4,7 @@ namespace :pages do
task :build => :environment do
- Item.delete_all
+ Item.destroy_all
var_10 = I18nVariable.create!( :document_class => 'Home', :key => 'home', :en => 'Homepage', :zh_tw => '首頁')
diff --git a/lib/tasks/site.rake b/lib/tasks/site.rake
index 74deba29..4415aed9 100644
--- a/lib/tasks/site.rake
+++ b/lib/tasks/site.rake
@@ -4,8 +4,8 @@ namespace :site do
task :build => :environment do
- Site.delete_all
- Purchase.delete_all
+ Site.destroy_all
+ Purchase.destroy_all
Site.create( :school => 'RulingDigital University', :department => 'Computer Science', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ])
diff --git a/public/desktop_themes/4f8d3f3c3b67fcd05f086358/images/d_seminar_p.png b/public/desktop_themes/4f8d3f3c3b67fcd05f086358/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f3c3b67fcd05f086358/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f3c3b67fcd05f086358/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f3c3b67fcd05f086358/settings/4f8d3f3c3b67fcd05f086358.json b/public/desktop_themes/4f8d3f3c3b67fcd05f086358/settings/4f8d3f3c3b67fcd05f086358.json
index 64701e64..2be2bcb8 100755
--- a/public/desktop_themes/4f8d3f3c3b67fcd05f086358/settings/4f8d3f3c3b67fcd05f086358.json
+++ b/public/desktop_themes/4f8d3f3c3b67fcd05f086358/settings/4f8d3f3c3b67fcd05f086358.json
@@ -9,7 +9,7 @@
"settings":"d_settings.png",
"publication":"d_publication.png",
"journal_p":"d_journal_p.png",
- "seminar_p":"d_seminar_p.png",
+ "conference_p":"d_conference_p.png",
"books":"d_books.png",
"research":"d_research.png",
"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
"connection":"d_connection.png",
"appstore":"d_appstore.png"
}
- }
\ No newline at end of file
+ }
diff --git a/public/desktop_themes/4f8d3f493b67fcd05f086359/images/d_seminar_p.png b/public/desktop_themes/4f8d3f493b67fcd05f086359/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f493b67fcd05f086359/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f493b67fcd05f086359/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f493b67fcd05f086359/settings/4f8d3f493b67fcd05f086359.json b/public/desktop_themes/4f8d3f493b67fcd05f086359/settings/4f8d3f493b67fcd05f086359.json
index 64701e64..2be2bcb8 100755
--- a/public/desktop_themes/4f8d3f493b67fcd05f086359/settings/4f8d3f493b67fcd05f086359.json
+++ b/public/desktop_themes/4f8d3f493b67fcd05f086359/settings/4f8d3f493b67fcd05f086359.json
@@ -9,7 +9,7 @@
"settings":"d_settings.png",
"publication":"d_publication.png",
"journal_p":"d_journal_p.png",
- "seminar_p":"d_seminar_p.png",
+ "conference_p":"d_conference_p.png",
"books":"d_books.png",
"research":"d_research.png",
"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
"connection":"d_connection.png",
"appstore":"d_appstore.png"
}
- }
\ No newline at end of file
+ }
diff --git a/public/desktop_themes/4f8d3f533b67fcd05f08635a/images/d_seminar_p.png b/public/desktop_themes/4f8d3f533b67fcd05f08635a/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f533b67fcd05f08635a/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f533b67fcd05f08635a/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f533b67fcd05f08635a/settings/4f8d3f533b67fcd05f08635a.json b/public/desktop_themes/4f8d3f533b67fcd05f08635a/settings/4f8d3f533b67fcd05f08635a.json
index 21c4eee1..b4e70f7a 100755
--- a/public/desktop_themes/4f8d3f533b67fcd05f08635a/settings/4f8d3f533b67fcd05f08635a.json
+++ b/public/desktop_themes/4f8d3f533b67fcd05f08635a/settings/4f8d3f533b67fcd05f08635a.json
@@ -9,7 +9,7 @@
"settings":"d_settings.png",
"publication":"d_publication.png",
"journal_p":"d_journal_p.png",
- "seminar_p":"d_seminar_p.png",
+ "conference_p":"d_conference_p.png",
"books":"d_books.png",
"research":"d_research.png",
"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
"connection":"d_connection.png",
"appstore":"d_appstore.png"
}
- }
\ No newline at end of file
+ }
diff --git a/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/images/d_seminar_p.png b/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f5d3b67fcd05f08635b/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f5d3b67fcd05f08635b/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/settings/4f8d3f5d3b67fcd05f08635b.json b/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/settings/4f8d3f5d3b67fcd05f08635b.json
index 64701e64..2be2bcb8 100755
--- a/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/settings/4f8d3f5d3b67fcd05f08635b.json
+++ b/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/settings/4f8d3f5d3b67fcd05f08635b.json
@@ -9,7 +9,7 @@
"settings":"d_settings.png",
"publication":"d_publication.png",
"journal_p":"d_journal_p.png",
- "seminar_p":"d_seminar_p.png",
+ "conference_p":"d_conference_p.png",
"books":"d_books.png",
"research":"d_research.png",
"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
"connection":"d_connection.png",
"appstore":"d_appstore.png"
}
- }
\ No newline at end of file
+ }
diff --git a/public/desktop_themes/4f8d3f673b67fcd05f08635c/images/d_seminar_p.png b/public/desktop_themes/4f8d3f673b67fcd05f08635c/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f673b67fcd05f08635c/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f673b67fcd05f08635c/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f673b67fcd05f08635c/settings/4f8d3f673b67fcd05f08635c.json b/public/desktop_themes/4f8d3f673b67fcd05f08635c/settings/4f8d3f673b67fcd05f08635c.json
index 64701e64..2be2bcb8 100755
--- a/public/desktop_themes/4f8d3f673b67fcd05f08635c/settings/4f8d3f673b67fcd05f08635c.json
+++ b/public/desktop_themes/4f8d3f673b67fcd05f08635c/settings/4f8d3f673b67fcd05f08635c.json
@@ -9,7 +9,7 @@
"settings":"d_settings.png",
"publication":"d_publication.png",
"journal_p":"d_journal_p.png",
- "seminar_p":"d_seminar_p.png",
+ "conference_p":"d_conference_p.png",
"books":"d_books.png",
"research":"d_research.png",
"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
"connection":"d_connection.png",
"appstore":"d_appstore.png"
}
- }
\ No newline at end of file
+ }
diff --git a/public/desktop_themes/4f8d3f783b67fcd05f08635d/images/d_seminar_p.png b/public/desktop_themes/4f8d3f783b67fcd05f08635d/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f783b67fcd05f08635d/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f783b67fcd05f08635d/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f783b67fcd05f08635d/settings/4f8d3f783b67fcd05f08635d.json b/public/desktop_themes/4f8d3f783b67fcd05f08635d/settings/4f8d3f783b67fcd05f08635d.json
index 64701e64..2be2bcb8 100755
--- a/public/desktop_themes/4f8d3f783b67fcd05f08635d/settings/4f8d3f783b67fcd05f08635d.json
+++ b/public/desktop_themes/4f8d3f783b67fcd05f08635d/settings/4f8d3f783b67fcd05f08635d.json
@@ -9,7 +9,7 @@
"settings":"d_settings.png",
"publication":"d_publication.png",
"journal_p":"d_journal_p.png",
- "seminar_p":"d_seminar_p.png",
+ "conference_p":"d_conference_p.png",
"books":"d_books.png",
"research":"d_research.png",
"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
"connection":"d_connection.png",
"appstore":"d_appstore.png"
}
- }
\ No newline at end of file
+ }
diff --git a/route b/route
deleted file mode 100644
index 36cad50c..00000000
--- a/route
+++ /dev/null
@@ -1,1038 +0,0 @@
- users_passwd PUT /users_passwd(.:format) desktop/registrations#update
- new_user_session GET /users/sign_in(.:format) devise/sessions#new
- user_session POST /users/sign_in(.:format) devise/sessions#create
- destroy_user_session GET /users/sign_out(.:format) devise/sessions#destroy
- user_password POST /users/password(.:format) devise/passwords#create
- new_user_password GET /users/password/new(.:format) devise/passwords#new
- edit_user_password GET /users/password/edit(.:format) devise/passwords#edit
- PUT /users/password(.:format) devise/passwords#update
- cancel_user_registration GET /users/cancel(.:format) devise/registrations#cancel
- user_registration POST /users(.:format) devise/registrations#create
- new_user_registration GET /users/sign_up(.:format) devise/registrations#new
- edit_user_registration GET /users/edit(.:format) devise/registrations#edit
- PUT /users(.:format) devise/registrations#update
- DELETE /users(.:format) devise/registrations#destroy
- resque_server /admin/resque Resque::Server
- site_set_registered /site/set_registered(.:format) CentralServerExchangeApp
- site_public_key /site/public_key(.:format) CentralServerExchangeApp
- site_update /site/update(.:format) GithubApp
- /purchase/:type(.:format) CentralServerExchangeApp
- load_orbit_bar /load_orbit_bar(.:format) pages#load_orbit_bar
- /admin/resque #>, @realm=nil, @authenticator=#>, @options={:reaction=>:drop_session, :logging=>true, :message=>"Forbidden", :encryptor=>Digest::SHA1, :session_key=>"rack.session", :status=>403, :allow_empty_referrer=>true, :html_types=>["text/html", "application/xhtml"], :xss_mode=>:block, :nosniff=>true, :except=>[:session_hijacking, :remote_token]}>, @options={:reaction=>:drop_session, :logging=>true, :message=>"Forbidden", :encryptor=>Digest::SHA1, :session_key=>"rack.session", :status=>403, :allow_empty_referrer=>true, :html_types=>["text/html", "application/xhtml"], :except=>[:session_hijacking, :remote_token]}>, @options={:reaction=>:drop_session, :logging=>true, :message=>"Forbidden", :encryptor=>Digest::SHA1, :session_key=>"rack.session", :status=>403, :allow_empty_referrer=>true, :html_types=>["text/html", "application/xhtml"], :except=>[:session_hijacking, :remote_token]}>, @options={:reaction=>:drop_session, :logging=>true, :message=>"Forbidden", :encryptor=>Digest::SHA1, :session_key=>"rack.session", :status=>403, :allow_empty_referrer=>true, :html_types=>["text/html", "application/xhtml"], :except=>[:session_hijacking, :remote_token]}>, @options={:reaction=>:drop_session, :logging=>true, :message=>"Forbidden", :encryptor=>Digest::SHA1, :session_key=>"rack.session", :status=>403, :allow_empty_referrer=>true, :html_types=>["text/html", "application/xhtml"], :except=>[:session_hijacking, :remote_token]}>, @options={:reaction=>:drop_session, :logging=>true, :message=>"Forbidden", :encryptor=>Digest::SHA1, :session_key=>"rack.session", :status=>403, :allow_empty_referrer=>true, :html_types=>["text/html", "application/xhtml"], :xss_mode=>:block, :nosniff=>true, :frame_options=>:sameorigin, :except=>[:session_hijacking, :remote_token]}>>>, @template=#\\n\\n\\n \\n \"\n\n\n\n; _erbout.concat((h exception.class ).to_s); _erbout.concat \" at \"; _erbout.concat((h path ).to_s); _erbout.concat \"\\n\\n \\n\\n\\n\\n\\n \\n \\n\\n
\\n
BACKTRACE
\\n
(expand)
\\n
JUMP TO:\\n GET\\n POST\\n COOKIES\\n ENV\\n
\\n
\\n\\n
\\n\\n \"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n; id = 1 ; _erbout.concat \"\\n \"\n; frames.each do |frame| ; _erbout.concat \"\\n \"\n; if frame.context_line && frame.context_line != \"#\" ; _erbout.concat \"\\n\\n - \\n
\"\n; _erbout.concat((h frame.filename ).to_s); _erbout.concat \" in\\n \"\n; _erbout.concat((h frame.function ).to_s); _erbout.concat \"\\n \\n\\n - \\n \"\n; if frame.pre_context ; _erbout.concat \"\\n
\\n \"\n; frame.pre_context.each do |line| ; _erbout.concat \"\\n \"\n; _erbout.concat((h line ).to_s); _erbout.concat \"
\\n \"\n\n; end ; _erbout.concat \"\\n\\n \\n \"; _erbout.concat((\n h frame.context_line ).to_s); _erbout.concat \"
\\n\\n \"\n\n\n; if frame.post_context ; _erbout.concat \"\\n \\n \"\n; frame.post_context.each do |line| ; _erbout.concat \"\\n \"\n; _erbout.concat((h line ).to_s); _erbout.concat \"
\\n \"\n\n; end ; _erbout.concat \"\\n \\n \\n\\n \"\n\n\n\n; end ; _erbout.concat \"\\n\\n \"\n\n; id += 1 ; _erbout.concat \"\\n \"\n; end ; _erbout.concat \"\\n\\n
\\n
\\n\\n
\\n
GET
\\n \"\n\n\n\n\n\n\n; if req.GET and not req.GET.empty? ; _erbout.concat \"\\n
\\n \\n | Variable | \\n Value | \\n
\\n \"\n\n\n\n\n\n; req.GET.sort_by { |k, v| k.to_s }.each { |key, val| ; _erbout.concat \"\\n \\n | \"\n\n; _erbout.concat((h key ).to_s); _erbout.concat \" | \\n \"\n; _erbout.concat((h val.inspect ).to_s); _erbout.concat \" | \\n
\\n \"\n\n; } ; _erbout.concat \"\\n
\\n \"\n\n; else ; _erbout.concat \"\\n
No GET data.
\\n \"\n\n; end ; _erbout.concat \"\\n
\\n
\\n\\n
\\n
POST
\\n \"\n\n\n\n\n\n; if req.POST and not req.POST.empty? ; _erbout.concat \"\\n
\\n \\n | Variable | \\n Value | \\n
\\n \"\n\n\n\n\n\n; req.POST.sort_by { |k, v| k.to_s }.each { |key, val| ; _erbout.concat \"\\n \\n | \"\n\n; _erbout.concat((h key ).to_s); _erbout.concat \" | \\n \"\n; _erbout.concat((h val.inspect ).to_s); _erbout.concat \" | \\n
\\n \"\n\n; } ; _erbout.concat \"\\n
\\n \"\n\n; else ; _erbout.concat \"\\n
No POST data.
\\n \"\n\n; end ; _erbout.concat \"\\n
\\n
\\n\\n
\\n
COOKIES
\\n \"\n\n\n\n\n\n; unless req.cookies.empty? ; _erbout.concat \"\\n
\\n \\n | Variable | \\n Value | \\n
\\n \"\n\n\n\n\n\n; req.cookies.each { |key, val| ; _erbout.concat \"\\n \\n | \"\n\n; _erbout.concat((h key ).to_s); _erbout.concat \" | \\n \"\n; _erbout.concat((h val.inspect ).to_s); _erbout.concat \" | \\n
\\n \"\n\n; } ; _erbout.concat \"\\n
\\n \"\n\n; else ; _erbout.concat \"\\n
No cookie data.
\\n \"\n\n; end ; _erbout.concat \"\\n
\\n
\\n\\n
\\n
Rack ENV
\\n
\\n \\n | Variable | \\n Value | \\n
\\n \"\n\n\n\n\n\n\n\n\n\n\n; env.sort_by { |k, v| k.to_s }.each { |key, val| ; _erbout.concat \"\\n \\n | \"\n\n; _erbout.concat((h key ).to_s); _erbout.concat \" | \\n \"\n; _erbout.concat((h val ).to_s); _erbout.concat \" | \\n
\\n \"\n\n; } ; _erbout.concat \"\\n
\\n
\\n
\\n\\n
You're seeing this error because you have\\nenabled the show_exceptions setting.
\\n
- <%= link_to t('archive_file_category.edit'), edit_panel_archive_back_end_archive_file_category_path(archive_file_category), :remote => true %>
- - <%= link_to t('archive_file_category.delete'), panel_archive_back_end_archive_file_category_path(archive_file_category), :confirm => t('sure?'), :method => :delete, :remote => true %>
+
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_files.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_file.html.erb
similarity index 53%
rename from vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_files.html.erb
rename to vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_file.html.erb
index 36d57f4e..2246d525 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_files.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_file.html.erb
@@ -1,30 +1,30 @@
-
+
- <% if post.is_top? %>
+ <% if archive_file.is_top? %>
<%= t(:top) %>
<% end %>
- <% if post.is_hot? %>
+ <% if archive_file.is_hot? %>
<%= t(:hot) %>
<% end %>
- <% if post.is_hidden? %>
+ <% if archive_file.is_hidden? %>
<%= t(:hidden) %>
<% end %>
<% if is_manager?%>
- - <%= link_to t('archive_file.edit'), edit_panel_archive_back_end_archive_file_path(post) %>
- - <%= link_to t('archive_file.delete'), panel_archive_back_end_archive_file_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %>
+ - <%= link_to t('archive_file.edit'), edit_panel_archive_back_end_archive_file_path(archive_file) %>
+ - <%= link_to t('archive_file.delete'), panel_archive_back_end_archive_file_path(archive_file), :confirm => t('sure?'), :method => :delete, :remote => true %>
<%end%>
|
- <%= post.archive_file_category.title %> |
+ <%= archive_file.archive_file_category.title %> |
- <%= link_to post.title, panel_archive_front_end_archive_file_path(post) %>
+ <%= link_to archive_file.title, panel_archive_front_end_archive_file_path(archive_file) %>
|
- <% post.tags.each do |tag| %>
+ <% archive_file.tags.each do |tag| %>
<%= tag[I18n.locale] %>
<% end %>
|
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/index.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/index.html.erb
index d1bfa6c1..dd54bcb5 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/index.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/index.html.erb
@@ -10,14 +10,11 @@
<%= t('archive_file.tags') %> |
-
-
- <% @archive_files.each do |post| %>
- <%= render :partial => 'archive_files', :locals => {:post => post} %>
- <% end %>
-
+
+ <%= render :partial => 'archive_file', :collection => @archive_files %>
-<%= paginate @archive_files %>
-
+
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/index.js.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/index.js.erb
new file mode 100644
index 00000000..7608ab33
--- /dev/null
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/index.js.erb
@@ -0,0 +1,2 @@
+$("#tbody_archive").html("<%= j render :partial => 'archive_file', :collection => @archive_files %>");
+$("#archive_pagination").html("<%= j paginate @archive_files %>");
\ No newline at end of file
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
index cfcf47f9..2fa34389 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
@@ -4,17 +4,17 @@
<%#= paginate @archive_files, :params => {:inner => false}%>
-<% if @title %>
- <%= @title %>
-<% end %>
+<%# if @title %>
+
+<%# end %>
-
- <% @archive_file_categorys.each do |afcpost| %>
- - <%= link_to afcpost.title, panel_archive_front_end_archive_files_path(:category_id => afcpost.id) %>
- <% end %>
-
+
+ <%# @archive_file_categorys.each do |afcpost| %>
+
+ <%# end %>
+
- <%= @archive_files.first.archive_file_category.title rescue nil %>
+ <%= @current_category.title rescue nil %>
<% @archive_files.each do |post| %>
diff --git a/vendor/built_in_modules/archive/config/routes.rb b/vendor/built_in_modules/archive/config/routes.rb
index ad23d554..ea923bba 100644
--- a/vendor/built_in_modules/archive/config/routes.rb
+++ b/vendor/built_in_modules/archive/config/routes.rb
@@ -3,7 +3,6 @@ Rails.application.routes.draw do
namespace :panel do
namespace :archive do
namespace :back_end do
- root :to => "archive_files#index"
resources :archive_files
resources :archive_file_categorys
resources :tags
diff --git a/vendor/built_in_modules/archive/init.rb b/vendor/built_in_modules/archive/init.rb
index 2ba59753..eaac9765 100644
--- a/vendor/built_in_modules/archive/init.rb
+++ b/vendor/built_in_modules/archive/init.rb
@@ -4,9 +4,6 @@ module Archive
base_url File.expand_path File.dirname(__FILE__)
personal_plugin :enable => true,:path=>"panel/archive/plugin/profile",:i18n=>'archive.archive'
-# =======
-# personal_plugin :enable => true,:path=>"panel/archive/plugin/profile",:i18n=>'admin.archive'
-# >>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1
version "0.1"
organization "Rulingcom"
diff --git a/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml b/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
index a3d6d5d9..117bbfd6 100644
--- a/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
@@ -2,13 +2,9 @@ zh_tw:
miss_module_i18n:
- # miss_plugin_i18n:
# personal_experience: 經歷
# personal_honor: 榮譽
-
-
# personal_project: 研究計畫
# personal_research: 研究
# personal_conference: 研討會論文
-
diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
index 48ebf333..95dc4998 100644
--- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
+++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
@@ -11,6 +11,8 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
end
def index
+
+ get_plugins
get_categorys("BookPaperType",params[:book_paper_type_id])
@filter = params[:filter]
@@ -50,6 +52,8 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
def writing_book_setting
+ get_plugins
+
@author_types = BookAuthorType.all
@paper_types = BookPaperType.all
@@ -120,6 +124,8 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
# GET /writing_books/new.xml
def new
+ get_plugins
+
@writing_book = WritingBook.new
# @writing_book_files = WritingBookFile.all
# @level_types = BookLevelType.all
@@ -136,6 +142,9 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
# GET /writing_books/1/edit
def edit
+
+ get_plugins
+
@writing_book = WritingBook.find(params[:id])
# @level_types = BookLevelType.all
@@ -271,7 +280,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
def delete
if params[:ids]
- writing_books = WritingBook.any_in(:_id => params[:ids]).delete_all
+ writing_books = WritingBook.any_in(:_id => params[:ids]).destroy_all
end
redirect_to panel_personal_book_back_end_writing_books_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
end
@@ -303,6 +312,10 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
# end
# end
+ def get_plugins
+ @plugins = OrbitApp::Plugin::Registration.all
+ end
+
def get_tags
module_app = ModuleApp.first(:conditions => {:key => 'personal_book'})
@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb
index 583b4897..2dfd4d8f 100644
--- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb
+++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb
@@ -146,7 +146,7 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
def delete
if params[:ids]
- writing_books = WritingBook.any_in(:_id => params[:ids]).delete_all
+ writing_books = WritingBook.any_in(:_id => params[:ids]).destroy_all
end
redirect_to panel_personal_book_plugin_writing_books_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
end
diff --git a/vendor/built_in_modules/personal_book/app/models/writing_book.rb b/vendor/built_in_modules/personal_book/app/models/writing_book.rb
index bc5fbdb3..432711da 100644
--- a/vendor/built_in_modules/personal_book/app/models/writing_book.rb
+++ b/vendor/built_in_modules/personal_book/app/models/writing_book.rb
@@ -51,7 +51,7 @@ class WritingBook
after_save :save_writing_book_files
- validates :url, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix, :unless => Proc.new{self.url.blank?}
+ validates :url, :format => /^(http|https):\/\/(([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5})|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:[0-9]{1,5})?(\/.*)?/i, :unless => Proc.new{self.url.blank?}
def self.search( category_id = nil )
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_filter.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_filter.html.erb
index 63882b8f..ad02d4da 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_filter.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_filter.html.erb
@@ -1,8 +1,6 @@
-
-
-
+
+
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_writing_book.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_writing_book.html.erb
index 7abee4b0..d5bfa6d9 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_writing_book.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_writing_book.html.erb
@@ -1,11 +1,11 @@
- |
+ |
<% if (writing_book.create_user_id == current_user.id) || is_manager? %>
<%= check_box_tag 'to_delete[]', writing_book.id, false, :class => "checkbox_in_list" %>
<% end -%>
|
- <%= writing_book.year %> |
-
+ | <%= writing_book.year %> |
+
<%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %>
|
- <%= User.from_id(writing_book.create_user_id).name rescue ''%> |
+ <%= User.from_id(writing_book.create_user_id).name rescue ''%> |
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/edit.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/edit.html.erb
index 716e3863..faed0f6d 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/edit.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/edit.html.erb
@@ -1,3 +1,14 @@
+
+<% content_for :side_bar do %>
+ <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+
+
<%= t('personal_book.editing_personal_book') %>
<%= form_for @writing_book, :url => panel_personal_book_back_end_writing_book_path(@writing_book), :html => {:class => 'clear'} do |f| %>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb
index 4595afbc..6a71d385 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb
@@ -1,12 +1,22 @@
+<% content_for :side_bar do %>
+ <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
<%= render 'filter' %>
+
+
+
|
|
- |
- |
- |
+ |
+ |
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/new.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/new.html.erb
index 07fb104a..af352ea5 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/new.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/new.html.erb
@@ -1,10 +1,22 @@
+<% content_for :side_bar do %>
+ <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+
+
<%= flash_messages %>
+
<%= t('writing_book.new_personal_book') %>
<%= form_for @writing_book, :url => panel_personal_book_back_end_writing_books_path, :html => {:class => 'clear'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %>
<% end %>
+
<%#= link_back %>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/writing_book_setting.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/writing_book_setting.html.erb
index 5db2c01c..8d556a6c 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/writing_book_setting.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/writing_book_setting.html.erb
@@ -1,5 +1,14 @@
<% # encoding: utf-8 %>
+<% content_for :side_bar do %>
+ <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+
diff --git a/vendor/built_in_modules/personal_book/init.rb b/vendor/built_in_modules/personal_book/init.rb
index 8275f505..ed06d651 100644
--- a/vendor/built_in_modules/personal_book/init.rb
+++ b/vendor/built_in_modules/personal_book/init.rb
@@ -1,12 +1,9 @@
module PersonalBook
- OrbitApp.registration "Book",:type=> 'ModuleApp' do
+ OrbitApp.registration "PersonalBook",:type=> 'ModuleApp' do
module_label 'module_name.personal_book'
- base_url File.expand_path File.dirname(__FILE__)
- personal_plugin :enable => true,:path=>"panel/personal_book/plugin/profile",:i18n=>'module_name.personal_book'
-
-
+ base_url File.expand_path File.dirname(__FILE__)
+ personal_plugin :enable => true,:path=>"panel/personal_book/plugin/profile",:admin_path=>"/panel/personal_book/back_end/writing_books",:i18n=>'module_name.personal_book'
end
-
end
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb
index eb2d1b04..778b3314 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb
@@ -11,6 +11,8 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
end
def index
+
+ get_plugins
get_categorys("ConferencePaperType",params[:conference_paper_type_id])
@filter = params[:filter]
@@ -51,6 +53,8 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
def writing_conference_setting
+ get_plugins
+
@author_types = ConferenceAuthorType.all
@paper_types = ConferencePaperType.all
@@ -120,6 +124,9 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
# GET /writing_conferences/new
# GET /writing_conferences/new.xml
def new
+
+ get_plugins
+
@writing_conference = WritingConference.new
# @writing_conference_files = WritingConferenceFile.all
# @paper_types = ConferenceLevelType.all
@@ -135,6 +142,9 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
# GET /writing_conferences/1/edit
def edit
+
+ get_plugins
+
@writing_conference = WritingConference.find(params[:id])
# @paper_types = ConferenceLevelType.all
@@ -269,7 +279,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
def delete
if params[:ids]
- writing_conferences = WritingConference.any_in(:_id => params[:ids]).delete_all
+ writing_conferences = WritingConference.any_in(:_id => params[:ids]).destroy_all
end
redirect_to panel_personal_conference_back_end_writing_conferences_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
end
@@ -301,6 +311,10 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
# end
# end
+ def get_plugins
+ @plugins = OrbitApp::Plugin::Registration.all
+ end
+
def get_tags
module_app = ModuleApp.first(:conditions => {:key => 'personal_conference'})
@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb
new file mode 100644
index 00000000..bfc09055
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb
@@ -0,0 +1,63 @@
+class Panel::PersonalConference::Desktop::ConferenceCoAuthorRelationsController < ApplicationController
+ def index
+ @conference_co_author_relations = ConferenceCoAuthorRelation.all
+ new
+
+ respond_to do |format|
+ format.html {render layout: false }
+ end
+ end
+
+ def edit
+ @conference_co_author_relation = ConferenceCoAuthorRelation.find(params[:id])
+ respond_to do |format|
+ format.html { render :layout => false}
+ end
+ end
+
+ def new
+ @conference_co_author_relation = ConferenceCoAuthorRelation.new
+ end
+
+ def create
+ @conference_co_author_relation = ConferenceCoAuthorRelation.new(params[:conference_co_author_relation])
+ @conference_co_author_relations = ConferenceCoAuthorRelation.all
+
+ if @conference_co_author_relation.save
+ newv = render_to_string partial: "show_form", object: @conference_co_author_relations
+ render json: {success: true, msg: "New Relation successfully saved!", newvalue: newv}.to_json
+ else
+ error_msg = @conference_co_author_relation.errors.full_messages.join("
")
+ render json: {success: false, msg: error_msg}.to_json
+ end
+ end
+
+ def update
+ @conference_co_author_relation = ConferenceCoAuthorRelation.find(params[:id])
+ if @conference_co_author_relation.update_attributes(params[:conference_co_author_relation])
+ @conference_co_author_relations = ConferenceCoAuthorRelation.all
+ newv = render_to_string partial: "show_form", object: @conference_co_author_relations
+ render json: {success: true, msg: "New Relation successfully updated!", newvalue: newv}.to_json
+ else
+ error_msg = @conference_co_author.errors.full_messages.join("
")
+ render json: {success: false, msg: error_msg}.to_json
+ end
+ end
+
+ def destroy
+ @conference_co_author_relation = ConferenceCoAuthorRelation.find(params[:id])
+ @conference_co_author_relation.destroy
+ reset_co_author_relation
+
+ render :json => {success: true, msg: "deleted successfully!"}
+ end
+
+ private
+
+ def reset_co_author_relation
+ co_author = ConferenceCoAuthor.where(co_author_relations_id: @co_author_relation.id)
+ co_author.map do |c|
+ c.update_attributes(co_author_relations_id: nil)
+ end
+ end
+end
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb
new file mode 100644
index 00000000..f371b7e7
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb
@@ -0,0 +1,59 @@
+class Panel::PersonalConference::Desktop::ConferenceCoAuthorsController < ApplicationController
+ def index
+ nils, not_nils = ConferenceCoAuthor.where(name_id: current_user.id)\
+ .asc(:co_author).partition{|p| p.email.nil?}
+ @conference_co_authors = not_nils + nils
+ @conference_co_author_relations = ConferenceCoAuthorRelation.all
+
+ respond_to do |format|
+ format.html { render :layout => false}
+ end
+ end
+
+ def new
+ @conference_co_author = ConferenceCoAuthor.new
+ @conference_co_author_relations = ConferenceCoAuthorRelation.all
+
+ respond_to do |format|
+ format.html { render :layout => false}
+ end
+ end
+
+ def edit
+ @conference_co_author = ConferenceCoAuthor.find(params[:id])
+ @conference_co_author_relations = ConferenceCoAuthorRelation.all
+ respond_to do |format|
+ format.html { render :layout => false}
+ end
+ end
+
+ def create
+ @conference_co_author = ConferenceCoAuthor.new(params[:conference_co_author])
+ @conference_co_author.name_id= current_user.id
+
+ if @conference_co_author.save
+ render json: {success:true, msg: t('create.sucess.co_author')}.to_json
+ else
+ error_msg = @conference_co_author.errors.full_messages.join("
")
+ render json: {success: false, msg: error_msg}.to_json
+ end
+ end
+
+ def update
+ @conference_co_author = ConferenceCoAuthor.find(params[:id])
+
+ if @conference_co_author.update_attributes(params[:co_author])
+ render json: {success:true, msg: t('update.sucess.co_author')}.to_json
+ else
+ error_msg = @conference_co_author.errors.full_messages.join("
")
+ render json: {success: false, msg: error_msg}.to_json
+ end
+ end
+
+ def destroy
+ @conference_co_author = ConferenceCoAuthor.find(params[:id])
+ @conference_co_author.destroy
+
+ render :json => {success: true, msg: "Co-author deleted successfully!"}
+ end
+end
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb
deleted file mode 100644
index c10256a9..00000000
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Panel::PersonalConference::Desktop::ConferencePController < ApplicationController
- def conference_p
- render panel_personal_conference_desktop_conference_p_path, :layout => false
- end
-end
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
index 602b24d0..4915d5c7 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
@@ -1,11 +1,82 @@
class Panel::PersonalConference::Desktop::ConferencePagesController < ApplicationController
def index
+ @writing_conferences = WritingConference.all
+ @level_types = ConferencePaperType.all
+
respond_to do |format|
format.html { render :layout => false}
end
end
+ def show
+ end
+
def new
+ @writing_conference = WritingConference.new
+ @paper_types = ConferencePaperType.all
+ @author_types = ConferenceAuthorType.all
+ #@co_author_candidate =
+ # CoAuthor.where(name_id: current_user.id).map{|c|c.co_author}
+ #@conference_candidate =
+ # WritingConference.where(create_user_id: current_user.id).map{|j|j.conference_title}.uniq
+
+ respond_to do |format|
+ format.html { render :layout => false}
+ end
+ end
+
+ def edit
+ @writing_conference = WritingConference.find(params[:id])
+ @paper_types = ConferencePaperType.all
+ @author_types = ConferenceAuthorType.all
+ respond_to do |format|
+ format.html { render :layout => false}
+ end
+ end
+
+ def create
+ params[:writing_conference][:create_user_id] = current_user.id
+ @writing_conference = WritingConference.new(params[:writing_conference])
+
+ if @writing_conference.save
+ render json: {success: true, msg: t('create.success.paper')}.to_json
+ else
+ error_msg = @writing_conference.errors.full_messages.join("
")
+ render json: {success: false, msg: error_msg}.to_json
+ end
+ end
+
+ def update
+ params[:writing_conference][:update_user_id] = current_user.id
+ @writing_conference= WritingConference.find(params[:id])
+
+ if @writing_conference.update_attributes(params[:writing_conference])
+ render json: {success: true, msg: t('update.success.paper')}.to_json
+ else
+ error_msg = @writing_conference.errors.full_messages.join("
")
+ render json: {success: false, msg: error_msg}.to_json
+ end
+ end
+
+ def destroy
+ @writing_conference = WritingConference.find(params[:id])
+ @writing_conference.destroy
+ render :json => {success: true, msg: t('delete.success.paper')}
+ end
+
+ def conference_type
+ conference_types = ConferencePaperType.all
+ all_conference_lists = WritingConference.where(create_user_id: current_user.id)
+ all_conference_lists = all_conference_lists.map do |j|
+ [ j.conference_title,
+ j.conference_paper_type_ids.map do |type|
+ conference_types.find(type).title
+ end
+ ]
+ end
+
+ @conference_lists = all_conference_lists.uniq
+
respond_to do |format|
format.html { render :layout => false}
end
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_windows_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_windows_controller.rb
new file mode 100644
index 00000000..216448c8
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_windows_controller.rb
@@ -0,0 +1,5 @@
+class Panel::PersonalConference::Desktop::ConferenceWindowsController < ApplicationController
+ def conference_window
+ render panel_personal_conference_desktop_conference_window_path, :layout => false
+ end
+end
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_seminars_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_seminars_controller.rb
new file mode 100644
index 00000000..dee56d69
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_seminars_controller.rb
@@ -0,0 +1,31 @@
+class Panel::PersonalConference::FrontEnd::WritingConferencesController < OrbitWidgetController
+
+ def initialize
+ super
+ @app_title = 'personal_conference'
+ end
+
+
+ def index
+
+ @writing_conferences = WritingConference.desc(:year).page(params[:page]).per(10)
+
+ end
+
+ # GET /writing_conferences/1
+ # GET /writing_conferences/1.xml
+ def show
+ @writing_conference = WritingConference.find(params[:id])
+
+ @conference_paper_types = ( !@writing_conference.conference_paper_types.blank? ? @writing_conference.conference_paper_types.collect{|x| x.title}.join(', ') : nil)
+ @conference_author_types = ( !@writing_conference.conference_author_types.blank? ? @writing_conference.conference_author_types.collect{|x| x.title}.join(', ') : nil)
+
+ end
+
+
+ def get_tags
+ module_app = ModuleApp.first(:conditions => {:key => 'personal_conference'})
+ @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
+ end
+
+end
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb
index 5b754ec9..23652834 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb
@@ -147,7 +147,7 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
def delete
if params[:ids]
- writing_conferences = WritingConference.any_in(:_id => params[:ids]).delete_all
+ writing_conferences = WritingConference.any_in(:_id => params[:ids]).destroy_all
end
redirect_to panel_personal_conference_plugin_writing_conferences_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
end
diff --git a/vendor/built_in_modules/personal_conference/test/dummy/app/mailers/.gitkeep b/vendor/built_in_modules/personal_conference/app/helpers/panel/.gitkeep
similarity index 100%
rename from vendor/built_in_modules/personal_conference/test/dummy/app/mailers/.gitkeep
rename to vendor/built_in_modules/personal_conference/app/helpers/panel/.gitkeep
diff --git a/vendor/built_in_modules/personal_conference/test/dummy/app/models/.gitkeep b/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/.gitkeep
similarity index 100%
rename from vendor/built_in_modules/personal_conference/test/dummy/app/models/.gitkeep
rename to vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/.gitkeep
diff --git a/vendor/built_in_modules/personal_conference/test/dummy/lib/assets/.gitkeep b/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/.gitkeep
similarity index 100%
rename from vendor/built_in_modules/personal_conference/test/dummy/lib/assets/.gitkeep
rename to vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/.gitkeep
diff --git a/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb b/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb
new file mode 100644
index 00000000..cac790d3
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb
@@ -0,0 +1,65 @@
+module Panel::PersonalConference::Desktop::ConferencePagesHelper
+ def publication_record publication
+ content_tag :li,
+ :class => "list_t_item" do
+ marker + \
+ content(publication) + \
+ edit_or_delete(publication)
+ end
+ end
+
+ def marker
+ content_tag :div,
+ :class => "list_item_action"
+ content_tag(:a, "", :class => "icon-check-empty") + \
+ content_tag(:a, "", :class => "icon-star-empty")
+ end
+
+ def content publication
+ content_tag(:div, "conference : " + publication.conference_title,
+ :class => "list_t_title") + \
+ content_tag(:div, "title : " + publication.paper_title,
+ :class => "list_t_des") + \
+ content_tag(:div, "keyword :" + publication.keywords,
+ :class => "list_t_des") + \
+ content_tag(:div, "abstract : " + publication.abstract,
+ :class => "list_t_des") + \
+ content_tag(:div, link_publication_file(publication),
+ :class => "list_t_des")
+ end
+
+ def edit_or_delete publication
+ content_tag :div,
+ :class => "list_item_function" do
+ content_tag(:a, t("edit"),
+ :class => "journal_paper_edit admbg2 admtxt",
+ :href => edit_panel_personal_conference_desktop_conference_page_path(publication),
+ "ajax-remote" => "get") + \
+ content_tag(:a, t("delete"),
+ "ajax-remote" => "delete",
+ "confirm-message" => t("sure?"),
+ "callback-method" => "paperDelete",
+ :class => "journal_paper_delete admbg2 admtxt",
+ :href => panel_personal_conference_desktop_conference_page_path(publication))
+ end
+ end
+
+ def link_publication_file publication
+ publication.writing_conference_files.map{|file|
+ link_to(image_tag(check_file_type(file.file.url)) + \
+ content_tag(:span, file.title, :class => "filetitle"),
+ file.file.url,
+ :class => "file",
+ "target" => "_blank")
+ }.inject(:+)
+ end
+
+ def check_file_type file
+ if not file.nil?
+ file_type = MIME::Types.type_for(file).first.to_s.split("/")[1]
+ file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png"
+ else
+ file_type = ""
+ end
+ end
+end
diff --git a/vendor/built_in_modules/personal_conference/app/models/conference_co_author.rb b/vendor/built_in_modules/personal_conference/app/models/conference_co_author.rb
new file mode 100644
index 00000000..71e5b17f
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/models/conference_co_author.rb
@@ -0,0 +1,20 @@
+class ConferenceCoAuthor
+ include Mongoid::Document
+
+ LANGUAGE_TYPES = [ "English", "Chinese" ]
+
+ field :name_id, type: BSON::ObjectId
+ field :co_author, localize: true
+ field :email
+
+ belongs_to :conference_co_author_relations
+
+ VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/
+ validates :email, format: { with: VALID_EMAIL_REGEX },
+ allow_blank: true,
+ uniqueness: { case_sensitive: false }
+
+ validates :co_author, presence: true
+ before_save { |coauthor| coauthor.email = email.downcase if not coauthor.email.nil?}
+end
+
diff --git a/vendor/built_in_modules/personal_conference/app/models/conference_co_author_relation.rb b/vendor/built_in_modules/personal_conference/app/models/conference_co_author_relation.rb
new file mode 100644
index 00000000..f36e5132
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/models/conference_co_author_relation.rb
@@ -0,0 +1,11 @@
+class ConferenceCoAuthorRelation
+ include Mongoid::Document
+ include Mongoid::Timestamps
+
+ field :relation, localize: true
+
+ has_and_belongs_to_many :conference_co_authors
+
+ validates :relation, presence: true,
+ uniqueness: { case_sensitive: false }
+end
diff --git a/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb b/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
index d10a8afe..efb05cf9 100644
--- a/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
+++ b/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
class WritingConference
include Mongoid::Document
include Mongoid::Timestamps
@@ -50,7 +48,7 @@ class WritingConference
after_save :save_writing_conference_files
- validates :url, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix, :unless => Proc.new{self.url.blank?}
+ validates :url, :format => /^(http|https):\/\/(([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5})|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:[0-9]{1,5})?(\/.*)?/i, :unless => Proc.new{self.url.blank?}
def self.search( category_id = nil )
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_filter.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_filter.html.erb
index 63882b8f..ad02d4da 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_filter.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_filter.html.erb
@@ -1,8 +1,6 @@
-
-
-
+
+
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/edit.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/edit.html.erb
index 9348b28c..d40d7ae6 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/edit.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/edit.html.erb
@@ -1,3 +1,13 @@
+<% content_for :side_bar do %>
+ <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+
+
<%= t('personal_conference.editing_personal_conference') %>
<%= form_for @writing_conference, :url => panel_personal_conference_back_end_writing_conference_path(@writing_conference), :html => {:class => 'clear'} do |f| %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/index.html.erb
index 2ff8406a..3126f05c 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/index.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/index.html.erb
@@ -1,12 +1,22 @@
+<% content_for :side_bar do %>
+ <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
<%= render 'filter' %>
+
+
+
|
|
- |
- |
- |
+ |
+ |
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/new.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/new.html.erb
index 3e450f81..f2664a90 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/new.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/new.html.erb
@@ -1,10 +1,21 @@
+<% content_for :side_bar do %>
+ <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+
<%= flash_messages %>
+
<%= t('writing_conference.new_personal_conference') %>
<%= form_for @writing_conference, :url => panel_personal_conference_back_end_writing_conferences_path, :html => {:class => 'clear'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %>
<% end %>
+
<%#= link_back %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/writing_conference_setting.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/writing_conference_setting.html.erb
index fec76937..7e86f073 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/writing_conference_setting.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/writing_conference_setting.html.erb
@@ -1,5 +1,14 @@
<% # encoding: utf-8 %>
+<% content_for :side_bar do %>
+ <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
new file mode 100644
index 00000000..d6f16b23
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
@@ -0,0 +1,11 @@
+<%= f.text_field :relation %>
+
+<%= f.submit "Save", class: "ini_input hp hh2 thmtxt thmc2", style: "margin-left: 10px;" %>
+<% if not @conference_co_author_relation.new_record? %>
+ <%= submit_tag "Cancel", :type => "button", class: "bt-cancel-type ini_input hp hh2 thmtxt" %>
+<% end %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_new.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_new.html.erb
new file mode 100644
index 00000000..42c5a8a8
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_new.html.erb
@@ -0,0 +1,3 @@
+<%= form_for(@conference_co_author_relation, url: panel_personal_conference_desktop_conference_co_author_relations_path, html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationForm"} ) do |f| %>
+ <%= render partial: 'form' , locals: {:f => f}%>
+<% end %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb
new file mode 100644
index 00000000..72566f1a
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb
@@ -0,0 +1,17 @@
+<% @conference_co_author_relations.each_with_index do |conference_co_author_relation,i| %>
+ <% if ( i % 6 ) == 0 %>
+
+ <% end %>
+<% end %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/edit.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/edit.html.erb
new file mode 100644
index 00000000..3f40e44a
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/edit.html.erb
@@ -0,0 +1,3 @@
+<%= form_for(@conference_co_author_relation, url: panel_personal_conference_desktop_conference_co_author_relation_path(@conference_co_author_relation), html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationEditForm"} ) do |f| %>
+ <%= render partial: 'form' , locals: {:f => f}%>
+<% end %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
similarity index 100%
rename from vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_author_relations/index.html.erb
rename to vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
new file mode 100644
index 00000000..0df7a876
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
@@ -0,0 +1,35 @@
+
+
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/edit.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/edit.html.erb
new file mode 100644
index 00000000..6d53c335
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/edit.html.erb
@@ -0,0 +1,3 @@
+<%= form_for @conference_co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: panel_personal_conference_desktop_conference_co_author_path(@conference_co_author) do |f| %>
+ <%= render partial: 'form', locals: {:f => f} %>
+<% end %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb
new file mode 100644
index 00000000..bc1e6bca
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb
@@ -0,0 +1,34 @@
+
+
+
+
+
+ <% @conference_co_authors.each_with_index do |co_author,i| %>
+ <% if ( i % 4 ) == 0 %>
+
+
+ <% end %>
+ -
+
+
+ <%= link_to 'Edit', edit_panel_personal_conference_desktop_conference_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %>
+ <%= link_to 'Destroy', panel_personal_conference_desktop_conference_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>'Are you sure?', "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %>
+
+
+ <% if ( i % 4 ) == 3 %>
+
+
+ <% end %>
+ <% end %>
+
+
+
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/new.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/new.html.erb
new file mode 100644
index 00000000..14e5a8b5
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/new.html.erb
@@ -0,0 +1,3 @@
+<%= form_for @conference_co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"conferenceCoAuthorformCallback"} , url: panel_personal_conference_desktop_conference_co_authors_path do |f| %>
+ <%= render partial: 'form', locals: {:f => f} %>
+<% end %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/show.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/show.html.erb
similarity index 100%
rename from vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/co_authors/show.html.erb
rename to vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/show.html.erb
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
new file mode 100644
index 00000000..8c5eb261
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form_file.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form_file.html.erb
new file mode 100644
index 00000000..dfbf9f22
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form_file.html.erb
@@ -0,0 +1,31 @@
+
" class="list_item">
+ |
+
+ <% if form_file.new_record? %>
+ <%= f.file_field :file, class: "s_grid_2 s_grid" %>
+ <% end %>
+
+ |
+
+ <%= f.text_field :title %>
+ <%= f.fields_for :file_title_translations do |f| %>
+ <%= f.text_field locale,
+ class: 's_grid_3 s_grid',
+ value: (form_file.file_title_translations[locale] rescue nil) %>
+ <% end %>
+ |
+
+
+
+ <% if form_file.new_record? %>
+
+ <% else %>
+ <%= f.hidden_field :id %>
+
+ <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
+ <% end %>
+ <%= form_file.file.file ? ( link_to '', form_file.file.url, {:class => 'icon-eye-open', :target => '_blank', :title => t(:view)} ) : '' %>
+
+ |
+
+
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb
new file mode 100644
index 00000000..a4fd58b2
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb
@@ -0,0 +1,40 @@
+
+
+
+
+
+ <% @conference_lists.each_with_index do |conference_list,i| %>
+ <% if ( i % 5 ) == 0 %>
+
+
+ <% end %>
+ -
+
+
+
+ <% title, level = conference_list %>
+ <%= title %>
+ <%= level.join(",") %>
+
+ <% if ( i % 5 ) == 4 %>
+
+
+ <% end %>
+ <% end %>
+
+
+
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/edit.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/edit.html.erb
new file mode 100644
index 00000000..860d2ef4
--- /dev/null
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/edit.html.erb
@@ -0,0 +1,4 @@
+<%= form_for @writing_conference, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_conference_desktop_conference_page_path(@writing_conference) do |f| %>
+ <%= render partial: 'form', locals: {:f => f} %>
+<%end%>
+
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
index e32e4d6c..7a3848df 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
@@ -1,75 +1,77 @@
\ No newline at end of file
+
+
+
+ <% @writing_conferences.each do |w| %>
+ <%= publication_record w%>
+ <% end %>
+
+
+
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb
index 28283456..eb8f8751 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb
@@ -1,107 +1,4 @@
-
-
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_p.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
similarity index 64%
rename from vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_p.html.erb
rename to vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
index 23e1484c..303aa092 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_p.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
@@ -13,10 +13,10 @@