diff --git a/app/controllers/admin/import_controller.rb b/app/controllers/admin/import_controller.rb
index fe910e1..f4b043d 100644
--- a/app/controllers/admin/import_controller.rb
+++ b/app/controllers/admin/import_controller.rb
@@ -805,8 +805,8 @@ class Admin::ImportController < OrbitAdminController
"zh_tw" => project["unit"]["zh-tw"]},
:year => project["year"],
:language => project["language"].sub("-","_"),
- :period_start_date => Date.strptime(project["start_date"].gsub('00','01'), '%Y-%m'),
- :period_end_date => Date.strptime(project["end_date"].gsub('00','01'), '%Y-%m'),
+ :period_start_date => (Date.strptime(project["start_date"].sub('-00','-01'), '%Y-%m') rescue nil),
+ :period_end_date => (Date.strptime(project["end_date"].sub('-00','-01'), '%Y-%m') rescue nil),
:url => project["reference_url"],
:note_translations => {
"en" => project["note"]["en"],
@@ -982,8 +982,8 @@ class Admin::ImportController < OrbitAdminController
"en" => experience["job_title"]["en"],
"zh_tw" => experience["job_title"]["zh-tw"]},
:language => experience["language"].gsub('-','_'),
- :start_date => Date.strptime(experience["start_date"].gsub('00','01'), '%Y-%m'),
- :end_date => Date.strptime(experience["end_date"].gsub('00','01'), '%Y-%m'),
+ :start_date => (Date.strptime(experience["start_date"].sub('-00','-01'), '%Y-%m') rescue nil),
+ :end_date => (Date.strptime(experience["end_date"].sub('-00','-01'), '%Y-%m') rescue nil),
:rss2_id => experience["rss2_id"])
new_experience.member_profile = member
@@ -1009,7 +1009,7 @@ class Admin::ImportController < OrbitAdminController
old_honor = Honor.where(:rss2_id => honor["rss2_id"]).first
if old_honor.nil?
new_honor = Honor.new(
- :year => honor["year"],
+ :year => (honor["year"].to_i<1900 ? (honor["year"].to_i+1911).to_s : honor["year"]),
:award_name_translations => {
"en" => honor["award_name"]["en"],
"zh_tw" => honor["award_name"]["zh-tw"]},
@@ -1054,7 +1054,7 @@ class Admin::ImportController < OrbitAdminController
:form_to_end => rss2_journal["from_to"][1],
:total_pages => rss2_journal["total_pages"],
:isbn => rss2_journal["issn"],
- :publication_date => Date.parse(rss2_journal["date_of_publication"].gsub('00','01')),
+ :publication_date => (Date.parse(rss2_journal["date_of_publication"].sub('-00','-01')) rescue nil),
:url => rss2_journal["reference_url"],
:note => rss2_journal["note"],
@@ -1126,8 +1126,8 @@ class Admin::ImportController < OrbitAdminController
:year => rss2_conference["year"],
:language => rss2_conference["language"].gsub('-','_'),
:isi_number => rss2_conference["isi_number"],
- :period_start_date => Date.parse(rss2_conference["start_date"].gsub('00','01')),
- :period_end_date => Date.parse(rss2_conference["end_date"].gsub('00','01')),
+ :period_start_date => (Date.parse(rss2_conference["start_date"].sub('-00','-01')) rescue nil),
+ :period_end_date => (Date.parse(rss2_conference["end_date"].sub('-00','-01')) rescue nil),
:url => rss2_conference["reference_url"],
:isbn => rss2_conference["issn"],
:note => rss2_conference["note"],
diff --git a/app/templates/orbit_bootstrap/modules/book/index.html.erb b/app/templates/orbit_bootstrap/modules/book/index.html.erb
index b755ec1..6dd578a 100644
--- a/app/templates/orbit_bootstrap/modules/book/index.html.erb
+++ b/app/templates/orbit_bootstrap/modules/book/index.html.erb
@@ -1,19 +1,18 @@
-
-
- {{widget-title}}
-
-
-
+ {{widget-title}}
+
+
+ | {{th_year}} |
+ {{th_title}} |
+ {{th_author}} |
+
+
+
+
+ | {{year}} |
+ {{book_title}} |
+ {{author}} |
+
+
+
{{pagination_goes_here}}
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/journal_paper/index.html.erb b/app/templates/orbit_bootstrap/modules/journal_paper/index.html.erb
index cc98f3f..817f19d 100644
--- a/app/templates/orbit_bootstrap/modules/journal_paper/index.html.erb
+++ b/app/templates/orbit_bootstrap/modules/journal_paper/index.html.erb
@@ -1,19 +1,18 @@
-
-
- {{widget-title}}
-
-
-
+ {{widget-title}}
+
+
+ | {{th_year}} |
+ {{th_title}} |
+ {{th_author}} |
+
+
+
+
+ | {{year}} |
+ {{paper_title}} |
+ {{author}} |
+
+
+
{{pagination_goes_here}}
\ No newline at end of file
diff --git a/config/initializers/keyword_constraint.rb b/config/initializers/keyword_constraint.rb
index 55f03b2..5579878 100644
--- a/config/initializers/keyword_constraint.rb
+++ b/config/initializers/keyword_constraint.rb
@@ -1,6 +1,6 @@
class KeywordConstraint
def matches?(request)
- keywords = %w{admin desktop user signup login}
+ keywords = ["/admin", "//desktop", "/user", "/signup", "/login"]
keywords.all? { |k| !request.url.include?(k) }
end
end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 3466242..445106b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -234,49 +234,6 @@ Orbit::Application.routes.draw do
get '(/:page)(/:page)(/:page)/member(/:name-:uid)', to: 'pages#show'
resources :pages
end
- # Example of regular route:
- # get 'products/:id' => 'catalog#view'
-
- # Example of named route that can be invoked with purchase_url(id: product.id)
- # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
- # Example resource route (maps HTTP verbs to controller actions automatically):
- # resources :products
-
- # Example resource route with options:
- # resources :products do
- # member do
- # get 'short'
- # post 'toggle'
- # end
- #
- # collection do
- # get 'sold'
- # end
- # end
-
- # Example resource route with sub-resources:
- # resources :products do
- # resources :comments, :sales
- # resource :seller
- # end
-
- # Example resource route with more complex sub-resources:
- # resources :products do
- # resources :comments
- # resources :sales do
- # get 'recent', on: :collection
- # end
- # end
-
- # Example resource route with concerns:
- # concern :toggleable do
- # post 'toggle'
- # end
- # resources :posts, concerns: :toggleable
- # resources :photos, concerns: :toggleable
-
- # Example resource route within a namespace:
namespace :admin do
# Directs /admin/products/* to Admin::ProductsController
# (app/controllers/admin/products_controller.rb)