From 88ad59f55aafa9ebfdf91cd7b8d89ab21ca1a364 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 16 Aug 2013 16:40:23 +0800 Subject: [PATCH] title and css fix for file view --- .../panel/personal_book/desktop/personal_books_helper.rb | 7 ++++--- .../personal_conference/desktop/conference_pages_helper.rb | 7 ++++--- .../personal_diploma/desktop/personal_diplomas_helper.rb | 7 ++++--- .../desktop/personal_experiences_helper.rb | 7 ++++--- .../panel/personal_honor/desktop/personal_honors_helper.rb | 7 ++++--- .../panel/personal_journal/desktop/journal_pages_helper.rb | 4 ++-- .../panel/personal_lab/desktop/personal_labs_helper.rb | 7 ++++--- .../personal_patent/desktop/personal_patents_helper.rb | 7 ++++--- .../personal_project/desktop/personal_projects_helper.rb | 7 ++++--- .../personal_research/desktop/personal_researchs_helper.rb | 7 ++++--- 10 files changed, 38 insertions(+), 29 deletions(-) diff --git a/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb b/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb index 6ccf4faa..04292390 100644 --- a/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb +++ b/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb @@ -2,7 +2,7 @@ module Panel::PersonalBook::Desktop::PersonalBooksHelper def publication_record publication, view content_tag :li, "item" => "true", - :class => "list_t_item" do + :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do marker + \ content(publication, view) + \ edit_or_delete(publication) @@ -65,10 +65,11 @@ module Panel::PersonalBook::Desktop::PersonalBooksHelper def link_publication_file publication publication.writing_book_files.map{|file| link_to(image_tag(check_file_type(file.file.url)) + \ - content_tag(:span, file.title, :class => "filetitle"), + content_tag(:span, file.file_title_translations[I18n.locale.to_s], :class => "filetitle"), file.file.url, :class => "file", - "target" => "_blank") + "target" => "_blank", + "title" => file.file_title_translations[I18n.locale.to_s]) }.inject(:+) end 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 index bf86b6f6..3a2fd2cc 100644 --- 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 @@ -2,7 +2,7 @@ module Panel::PersonalConference::Desktop::ConferencePagesHelper def publication_record publication, view content_tag :li, "item" => "true", - :class => "list_t_item" do + :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do marker + \ content(publication, view) + \ edit_or_delete(publication) @@ -65,10 +65,11 @@ module Panel::PersonalConference::Desktop::ConferencePagesHelper 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"), + content_tag(:span, file.file_title_translations[I18n.locale.to_s], :class => "filetitle"), file.file.url, :class => "file", - "target" => "_blank") + "target" => "_blank", + "title" => file.file_title_translations[I18n.locale.to_s]) }.inject(:+) end diff --git a/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb b/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb index da5f24a9..031b07c2 100644 --- a/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb +++ b/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb @@ -2,7 +2,7 @@ module Panel::PersonalDiploma::Desktop::PersonalDiplomasHelper def publication_record publication, view content_tag :li, "item" => "true", - :class => "list_t_item" do + :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do marker + \ content(publication, view) + \ edit_or_delete(publication) @@ -65,10 +65,11 @@ module Panel::PersonalDiploma::Desktop::PersonalDiplomasHelper 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"), + content_tag(:span, file.file_title_translations[I18n.locale.to_s], :class => "filetitle"), file.file.url, :class => "file", - "target" => "_blank") + "target" => "_blank", + "title" => file.file_title_translations[I18n.locale.to_s]) }.inject(:+) end diff --git a/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb b/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb index 77be8755..eda87783 100644 --- a/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb +++ b/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb @@ -2,7 +2,7 @@ module Panel::PersonalExperience::Desktop::PersonalExperiencesHelper def publication_record publication, view content_tag :li, "item" => "true", - :class => "list_t_item" do + :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do marker + \ content(publication, view) + \ edit_or_delete(publication) @@ -65,10 +65,11 @@ module Panel::PersonalExperience::Desktop::PersonalExperiencesHelper 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"), + content_tag(:span, file.file_title_translations[I18n.locale.to_s], :class => "filetitle"), file.file.url, :class => "file", - "target" => "_blank") + "target" => "_blank", + "title" => file.file_title_translations[I18n.locale.to_s]) }.inject(:+) end diff --git a/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb b/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb index 1114d7aa..c1172f6d 100644 --- a/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb +++ b/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb @@ -2,7 +2,7 @@ module Panel::PersonalHonor::Desktop::PersonalHonorsHelper def publication_record publication, view content_tag :li, "item" => "true", - :class => "list_t_item" do + :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do marker + \ content(publication, view) + \ edit_or_delete(publication) @@ -58,10 +58,11 @@ module Panel::PersonalHonor::Desktop::PersonalHonorsHelper def link_publication_file publication publication.writing_book_files.map{|file| link_to(image_tag(check_file_type(file.file.url)) + \ - content_tag(:span, file.title, :class => "filetitle"), + content_tag(:span, file.file_title_translations[I18n.locale.to_s], :class => "filetitle"), file.file.url, :class => "file", - "target" => "_blank") + "target" => "_blank", + "title" => file.file_title_translations[I18n.locale.to_s]) }.inject(:+) end diff --git a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb index e3cdbc5b..28ee2598 100644 --- a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb +++ b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb @@ -66,11 +66,11 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper def link_publication_file publication publication.writing_journal_files.map{|file| link_to(image_tag(check_file_type(file.file.url)) + \ - content_tag(:span, file.title, :class => "filetitle"), + content_tag(:span, file.file_title_translations[I18n.locale.to_s], :class => "filetitle"), file.file.url, :class => "file", "target" => "_blank", - "title" => file.title) + "title" => file.file_title_translations[I18n.locale.to_s]) }.inject(:+) end diff --git a/vendor/built_in_modules/personal_lab/app/helpers/panel/personal_lab/desktop/personal_labs_helper.rb b/vendor/built_in_modules/personal_lab/app/helpers/panel/personal_lab/desktop/personal_labs_helper.rb index 2343bfd7..80511a3d 100644 --- a/vendor/built_in_modules/personal_lab/app/helpers/panel/personal_lab/desktop/personal_labs_helper.rb +++ b/vendor/built_in_modules/personal_lab/app/helpers/panel/personal_lab/desktop/personal_labs_helper.rb @@ -2,7 +2,7 @@ module Panel::PersonalLab::Desktop::PersonalLabsHelper def publication_record publication, view content_tag :li, "item" => "true", - :class => "list_t_item" do + :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do marker + \ content(publication, view) + \ edit_or_delete(publication) @@ -65,10 +65,11 @@ module Panel::PersonalLab::Desktop::PersonalLabsHelper def link_publication_file publication publication.lab_files.map{|file| link_to(image_tag(check_file_type(file.file.url)) + \ - content_tag(:span, file.title, :class => "filetitle"), + content_tag(:span, file.file_title_translations[I18n.locale.to_s], :class => "filetitle"), file.file.url, :class => "file", - "target" => "_blank") + "target" => "_blank", + "title" => file.file_title_translations[I18n.locale.to_s]) }.inject(:+) end diff --git a/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb b/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb index a30f1305..ed2141d0 100644 --- a/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb +++ b/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb @@ -2,7 +2,7 @@ module Panel::PersonalPatent::Desktop::PersonalPatentsHelper def publication_record publication, view content_tag :li, "item" => "true", - :class => "list_t_item" do + :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do marker + \ content(publication, view) + \ edit_or_delete(publication) @@ -65,10 +65,11 @@ module Panel::PersonalPatent::Desktop::PersonalPatentsHelper def link_publication_file publication publication.writing_patent_files.map{|file| link_to(image_tag(check_file_type(file.file.url)) + \ - content_tag(:span, file.title, :class => "filetitle"), + content_tag(:span, file.file_title_translations[I18n.locale.to_s], :class => "filetitle"), file.file.url, :class => "file", - "target" => "_blank") + "target" => "_blank", + "title" => file.file_title_translations[I18n.locale.to_s]) }.inject(:+) end diff --git a/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb b/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb index 1258db89..dd5f45ad 100644 --- a/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb +++ b/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb @@ -2,7 +2,7 @@ module Panel::PersonalProject::Desktop::PersonalProjectsHelper def publication_record publication, view content_tag :li, "item" => "true", - :class => "list_t_item" do + :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do marker + \ content(publication, view) + \ edit_or_delete(publication) @@ -65,10 +65,11 @@ module Panel::PersonalProject::Desktop::PersonalProjectsHelper def link_publication_file publication publication.project_files.map{|file| link_to(image_tag(check_file_type(file.file.url)) + \ - content_tag(:span, file.title, :class => "filetitle"), + content_tag(:span, file.file_title_translations[I18n.locale.to_s], :class => "filetitle"), file.file.url, :class => "file", - "target" => "_blank") + "target" => "_blank", + "title" => file.file_title_translations[I18n.locale.to_s]) }.inject(:+) end diff --git a/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb b/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb index 204d7c3b..ffc2d64c 100644 --- a/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb +++ b/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb @@ -2,7 +2,7 @@ module Panel::PersonalResearch::Desktop::PersonalResearchsHelper def publication_record publication, view content_tag :li, "item" => "true", - :class => "list_t_item" do + :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do marker + \ content(publication, view) + \ edit_or_delete(publication) @@ -65,10 +65,11 @@ module Panel::PersonalResearch::Desktop::PersonalResearchsHelper def link_publication_file publication publication.research_files.map{|file| link_to(image_tag(check_file_type(file.file.url)) + \ - content_tag(:span, file.title, :class => "filetitle"), + content_tag(:span, file.file_title_translations[I18n.locale.to_s], :class => "filetitle"), file.file.url, :class => "file", - "target" => "_blank") + "target" => "_blank", + "title" => file.file_title_translations[I18n.locale.to_s]) }.inject(:+) end