From 9cb35af4ad703da19b8da96613731b552ee91635 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 27 Jun 2014 17:08:03 +0800 Subject: [PATCH] new widget breadcrumb and small bug fixed in import pages --- app/controllers/admin/import_controller.rb | 6 +++--- .../widgets/breadcrumb_widget/_widget.html.erb | 7 +++++++ built_in_extensions.rb | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 app/templates/orbit_bootstrap/widgets/breadcrumb_widget/_widget.html.erb diff --git a/app/controllers/admin/import_controller.rb b/app/controllers/admin/import_controller.rb index dd5a91d..64e1163 100644 --- a/app/controllers/admin/import_controller.rb +++ b/app/controllers/admin/import_controller.rb @@ -241,14 +241,14 @@ class Admin::ImportController < OrbitAdminController p_id = page_id + "_" + i.to_s case childpage["type"] when "page" - cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "page", :url => "#{p.page_id}/#{p_id}", :module => "page_content", "enabled_for" => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]},:rss2_id => childpage["page_id"]) + cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "page", :url => "/#{p.page_id}/#{p_id}", :module => "page_content", "enabled_for" => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]},:rss2_id => childpage["page_id"]) cp.save en = smart_downloader(childpage["content"]["en"],data["site_url"]) zh_tw = smart_downloader(childpage["content"]["zh_tw"],data["site_url"]) page_context = PageContext.new(:content_translations => {"en" => en,"zh_tw" => zh_tw}, :version => 1, :update_user_id => current_user.id, :page_id => cp.id) page_context.save when "exturl" - cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "link", "url" => "#{p.page_id}/#{p_id}", :enabled_for => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]}, :external_url_translations => {"en" => childpage["url"], "zh_tw" => childpage["url"]},:rss2_id => childpage["page_id"]) + cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "link", "url" => "/#{p.page_id}/#{p_id}", :enabled_for => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]}, :external_url_translations => {"en" => childpage["url"], "zh_tw" => childpage["url"]},:rss2_id => childpage["page_id"]) cp.save when "file" asset = Asset.new @@ -258,7 +258,7 @@ class Admin::ImportController < OrbitAdminController @user.assets << asset @user.save external_url = asset.data.url - cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "link", "url" => "#{p.page_id}/#{p_id}", :enabled_for => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]}, :external_url_translations => {"en" => external_url, "zh_tw" => external_url},:rss2_id => childpage["page_id"]) + cp = Page.new(:page_id => p_id, :parent_page_id => p.id, :page_type => "link", "url" => "/#{p.page_id}/#{p_id}", :enabled_for => ["en", "zh_tw"], :menu_enabled_for => ["en", "zh_tw"], :enabled_for_sitemap => ["en","zh_tw"], :name_translations => {"en"=>childpage["title"]["en"], "zh_tw" => childpage["title"]["zh_tw"]}, :external_url_translations => {"en" => external_url, "zh_tw" => external_url},:rss2_id => childpage["page_id"]) cp.save end end diff --git a/app/templates/orbit_bootstrap/widgets/breadcrumb_widget/_widget.html.erb b/app/templates/orbit_bootstrap/widgets/breadcrumb_widget/_widget.html.erb new file mode 100644 index 0000000..dfe4ca5 --- /dev/null +++ b/app/templates/orbit_bootstrap/widgets/breadcrumb_widget/_widget.html.erb @@ -0,0 +1,7 @@ +
+ +
\ No newline at end of file diff --git a/built_in_extensions.rb b/built_in_extensions.rb index 33f40b8..a84c7c4 100644 --- a/built_in_extensions.rb +++ b/built_in_extensions.rb @@ -9,4 +9,5 @@ gem 'faq', git: 'git@gitlab.tp.rulingcom.com:saurabh/faq.git' gem 'personal_journal', git: 'git@gitlab.tp.rulingcom.com:saurabh/personal-journal.git' #widgets -gem "site_menu_widget", git: 'git@gitlab.tp.rulingcom.com:saurabh/site-menu-widget.git' \ No newline at end of file +gem "site_menu_widget", git: 'git@gitlab.tp.rulingcom.com:saurabh/site-menu-widget.git' +gem "breadcrumb_widget", git: "git@gitlab.tp.rulingcom.com:saurabh/breadcrumb-widget.git" \ No newline at end of file