diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb index 9e1e5bec3..0eeb0567a 100644 --- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb +++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb @@ -45,7 +45,9 @@ <% end %>
  • <%= t("users.email")%><%= member.email %>
    • + <% if !member.office_tel.blank? %>
  • <%= t("users.office_tel")%><%= member.office_tel %>
    • + <% end %> @@ -84,7 +86,9 @@
  • <%= @job_title_field.title %><%= @job_title %>
    • <% end %>
  • <%= t("users.email")%> <%= member.email %>
    • + <% if !member.office_tel.blank? %>
  • <%= t("users.office_tel")%><%= member.office_tel %>
    • + <% end %> diff --git a/vendor/built_in_modules/member_staff/app/assets/stylesheets/member_staff/default_member.css b/vendor/built_in_modules/member_staff/app/assets/stylesheets/member_staff/default_member.css new file mode 100644 index 000000000..0adecdab8 --- /dev/null +++ b/vendor/built_in_modules/member_staff/app/assets/stylesheets/member_staff/default_member.css @@ -0,0 +1,125 @@ +.default_member:after { + content: ""; + clear: both; + display: block; + visibility: hidden; +} +.default_member .member-pic { + float: left; + width: 30%; +} +.default_member .member-pic img { + width: 100%; + height: auto; +} +.default_member .member-data { + float: right; + width: 68%; +} +.default_member .member-data table { + width: 100%; + background-color: #fff; +} +.default_member .member-data table td { + padding: 5px; + background-color: #ccc; + border: 1px solid #fff; +} +.default_member .member-data table td + td { + background-color: #ededed; +} +.default_member .member-module { + clear: both; + padding-top: 30px; +} +.default_member .member-module .module-nav ul { + margin: 0; + padding: 0; + list-style: none; + border-bottom: 1px solid #ccc; +} +.default_member .member-module .module-nav ul:after { + content: ""; + clear: both; + display: block; + height: 0; + visibility: hidden; +} +.default_member .member-module .module-nav ul li { + float: left; + display: inline-block; + margin-right: 3px; + margin-bottom: 5px; +} +.default_member .member-module .module-nav ul li a { + padding: 5px 8px; + line-height: 30px; + height: 30px; + border-radius: 3px; + text-decoration: none; + background-color: #DDD; +} +.default_member .member-module .module-nav ul li.active a { + background-color: #0088CE; + color: #FFF; +} +.default_member .member-module .module-content { + position: relative; + margin-bottom: 20px; +} +.default_member .member-module .module-content .module-pane { + display: none; + top: 0; + left: 0; +} +.default_member .member-module .module-content .module-pane table { + width: 100%; +} +.default_member .member-module .module-content .module-pane.active { + display: block; +} + + + + + + +[class*="grid"] + [class*="grid"] { + margin-left: 2.12766%; +} +.grid12 { + width: 100%; +} +.grid11 { + width: 91.4894%; +} +.grid10 { + width: 82.9787%; +} +.grid9 { + width: 74.4681%; +} +.grid8 { + width: 65.9574%; +} +.grid7 { + width: 57.4468%; +} +.grid6 { + width: 48.9362%; +} +.grid5 { + width: 40.4255%; +} +.grid4 { + width: 31.9149%; +} +.grid3 { + width: 23.4043%; +} +.grid2 { + width: 14.8936%; +} +.grid1 { + width: 6.38298%; +} \ No newline at end of file diff --git a/vendor/built_in_modules/member_staff/app/controllers/panel/member_staff/front_end/member_staff_lists_controller.rb b/vendor/built_in_modules/member_staff/app/controllers/panel/member_staff/front_end/member_staff_lists_controller.rb index f79c82b99..ad4e849da 100644 --- a/vendor/built_in_modules/member_staff/app/controllers/panel/member_staff/front_end/member_staff_lists_controller.rb +++ b/vendor/built_in_modules/member_staff/app/controllers/panel/member_staff/front_end/member_staff_lists_controller.rb @@ -51,7 +51,7 @@ class Panel::MemberStaff::FrontEnd::MemberStaffListsController < OrbitWidgetCont end def show - @member_list = User.find(params[:id]) + @member = User.find(params[:id]) # get_categorys end diff --git a/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/_show_roles.html.erb b/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/_show_roles.html.erb new file mode 100644 index 000000000..7d8219a6b --- /dev/null +++ b/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/_show_roles.html.erb @@ -0,0 +1,52 @@ + <% + @status = @member.role_statuses.where(:role_id=>show_roles.id) + + if !@status.blank? + %> + + <%= t('status')%> + <%= show_attribute_value(@member.role_statuses.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %> + + + <% end -%> + + <% + @category = @member.role_categorys.where(:role_id=>show_roles.id) + + if !@category.blank? + %> + + <%= t('category')%> + <%= show_attribute_value(@member.role_categorys.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %> + + + <% end -%> + + <% show_roles.attribute_fields.where(:disabled=>false).asc(:_id).each do |rf| %> + + <% + if !@member.get_attribute_value(rf).blank? + if !@member.get_attribute_value(rf)['val'].blank? + @rodata = @member.get_attribute_value(rf)['val'] + elsif !@member.get_attribute_value(rf)[I18n.locale].blank? + @rodata = @member.get_attribute_value(rf)[I18n.locale] + else + @rodata = nil + end + + if !@rodata.blank? and !@member.get_attribute_value(rf).get_value_by_locale(I18n.locale).blank? + %> + + + <%= rf.title %> + <%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %> + + + <% end -%> + + <% end -%> + + <% end -%> + + <%= render :partial => 'show_sub_role',:collection=> @member.get_sub_roles_by_role(show_roles)%> + diff --git a/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/_show_sub_role.html.erb b/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/_show_sub_role.html.erb new file mode 100644 index 000000000..612c27c36 --- /dev/null +++ b/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/_show_sub_role.html.erb @@ -0,0 +1,28 @@ + + + <% show_sub_role.attribute_fields.where(:disabled=>false).asc(:_id).each do |item| %> + + + <% + + if !@member.get_attribute_value(item).blank? + if !@member.get_attribute_value(item)['val'].blank? + @rodata = @member.get_attribute_value(item)['val'] + elsif !@member.get_attribute_value(item)[I18n.locale].blank? + @rodata = @member.get_attribute_value(item)[I18n.locale] + else + @rodata = nil + end + end + + if !@rodata.blank? and !@member.get_attribute_value(item).get_value_by_locale(I18n.locale).blank? + %> + + + <%= item.title %> + <%= nl2br(show_attribute_value(@member.get_attribute_value(item).get_value_by_locale(I18n.locale))) rescue '' %> + + + <% end -%> + + <% end -%> \ No newline at end of file diff --git a/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/index.html.erb b/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/index.html.erb index dbe0d7027..086f6ac46 100644 --- a/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/index.html.erb +++ b/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/index.html.erb @@ -44,8 +44,10 @@ <%= @job_title %> <% end %> -
  • <%= t("users.name")%><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %>
    • +
  • <%= t("users.name")%><%= link_to member.name, panel_member_staff_front_end_member_staff_list_path(member.id), {:class => "o-members-link"} %>
    • + <% if !member.office_tel.blank? %>
  • <%= t("users.office_tel")%><%= member.office_tel %>
    • + <% end %>
  • <%= t("users.email")%><%= member.email %>
    • <% @job_business = @member_lists.get_member_list_attribute_value(member.id,@job_business_field.id).get_value_by_locale(I18n.locale) @@ -93,8 +95,10 @@ <%= @job_title %> <% end %> -
  • <%= t("users.name")%><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %>
    • +
  • <%= t("users.name")%><%= link_to member.name, panel_member_staff_front_end_member_staff_list_path(member.id), {:class => "o-members-link"} %>
    • + <% if !member.office_tel.blank? %>
  • <%= t("users.office_tel")%><%= member.office_tel %>
    • + <% end %>
  • <%= t("users.email")%><%= member.email %>
    • @@ -165,7 +169,9 @@ <%= link_to member.name, "mailto:#{member.email}" %> + <% if !member.office_tel.blank? %> <%= member.office_tel %> + <% end %> <% @job_business = @member_lists.get_member_list_attribute_value(member.id,@job_business_field.id).get_value_by_locale(I18n.locale) diff --git a/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/show.html.erb b/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/show.html.erb index e69de29bb..69dcc084a 100644 --- a/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/show.html.erb +++ b/vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/show.html.erb @@ -0,0 +1,44 @@ +
    +
    + + + + + + + + + + + <% if !@member.sid.blank? %> + + + + + <% end %> + <% if !@member.office_tel.blank? %> + + + + + <% end %> + + + + + + <%= render :partial=> "show_roles",:collection=>@member.roles.where(:disabled=>false).asc(:created_at) %> + + +
    <%= t('users.name')%><%= @member.name%>
    <%= t('users.email')%><%= @member.email %>
    <%= t('users.sid')%><%= @member.sid%>
    <%= t('users.office_tel')%><%= @member.office_tel%>
    <%= t('users.sex')%><%= t("users.#{@member.sex}") %>
    +
    + +
    + <%= image_tag(@member.avatar) %> +
    + +
    + + +<%= stylesheet_link_tag "member_staff/default_member" %> + diff --git a/vendor/built_in_modules/member_staff/config/routes.rb b/vendor/built_in_modules/member_staff/config/routes.rb index 873477bb1..8a26cf0a9 100644 --- a/vendor/built_in_modules/member_staff/config/routes.rb +++ b/vendor/built_in_modules/member_staff/config/routes.rb @@ -10,7 +10,7 @@ Rails.application.routes.draw do end namespace :front_end do match "member_staff_lists" => "member_staff_lists#index" - resources :member_lists + resources :member_staff_lists end namespace :widget do match "index" => "member_staff_lists#index" diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb index c5d3cf732..1ce3ef7e4 100644 --- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb +++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb @@ -8,7 +8,7 @@ class Panel::PersonalBook::FrontEnd::WritingBooksController < OrbitWidgetControl def index - @writing_books = WritingBook.desc(:year).page(params[:page]).per(10) + @writing_books = WritingBook.where(:is_hidden => false).desc(:year,:publish_date).page(params[:page]).per(10) 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 39c81a6ff..159fc770d 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 @@ -84,11 +84,17 @@ class WritingBook def create_link title = [] - # title = ["#{self.extracted_chapters}"] if self.extracted_chapters.present? - title << self.paper_title if self.paper_title.present? + title << self.authors if self.authors.present? + + # title << self.paper_title if self.paper_title.present? title << self.book_title if self.book_title.present? title << self.publisher if self.publisher.present? - title << self.pages if self.pages.present? + title << self.isbn if self.isbn.present? + + pd = self.publish_date.strftime("%Y-%m-%d").split('-') + + title << pd[0]+"/"+pd[1] + # title << "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})" title.join(', ') end 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 5ba71a480..495b7116b 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 @@ -103,10 +103,9 @@
    - 匯出  - 匯入  - 新增  - 設定　 + + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_book_back_end_writing_book_path, :class => 'btn btn-primary pull-right' %>
    diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/_profile.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/_profile.html.erb index 451ca3ca4..ae590fce8 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/_profile.html.erb @@ -1,7 +1,7 @@ <% if @member - @writing_books = WritingBook.where(is_hidden: false, :create_user_id => @member.id).desc(:year) + @writing_books = WritingBook.where(is_hidden: false, :create_user_id => @member.id).desc(:year,:publish_date) @writing_book_intro = !PersonalBookIntro.where(:user_id => @member.id).blank? ? PersonalBookIntro.where(:user_id => @member.id).first : PersonalBookIntro.new %> @@ -35,7 +35,7 @@ <%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %> - <%= writing_book.authors %> + <%= User.find(writing_book.create_user_id).name rescue '' %> <% end %> diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/index.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/index.html.erb index 0eec32ca8..02777a59b 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/index.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/index.html.erb @@ -2,26 +2,37 @@ <%= flash_messages %> -

    <%= t('writing_book.list_writing_book') %>

    +

    <%= t('module_name.personal_book') %>

    - - - - - + - <% @writing_books.each do |post| %> - - +
    <%= t(:year) %><%= t(:title) %>
    <%= post.year %>
    + + + + + + + + + + + <% @writing_books.each do |writing_book| %> + + + + - - - <% end %> - -
    <%= t('personal_book.year') %><%= t('personal_book.book_paper_type') %><%= t('personal_book.book_title') %><%= t('personal_book.authors') %>
    <%= writing_book.year %><%= writing_book.book_paper_type.title %> - <%= link_to post.create_link , panel_personal_book_front_end_writing_book_path(post) %> + <%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %>
    + <%= User.find(writing_book.create_user_id).name rescue '' %> + + + <% end %> + + + <%= paginate @writing_books, :params => {:inner => false}%> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/show.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/show.html.erb index 94167db97..8c87f07b5 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/show.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/show.html.erb @@ -1,37 +1,79 @@ <% # encoding: utf-8 %> - - - - - - - - - - - - - - - - - - - - + + <% if !@writing_book.year.blank? %> + + <% end %> + + <% if !@writing_book.language.blank? %> + + <% end %> + + <% if !@writing_book.paper_title.blank? %> + + <% end %> + + <% if !@writing_book.book_title.blank? %> + + <% end %> + + <% if !@writing_book.book_paper_type.blank? %> + + <% end %> + + <% if !@book_author_types.blank? %> + + <% end %> + + <% if !@writing_book.extracted_chapters.blank? %> + + <% end %> + + <% if !@writing_book.publisher.blank? %> + + <% end %> + + <% if !@writing_book.editor.blank? %> + + <% end %> + + <% if !@writing_book.publish_date.blank? %> + + <% end %> + + <% if !@writing_book.pages.blank? %> + + <% end %> + + <% if !@writing_book.isbn.blank? %> + + <% end %> + + <% if !@writing_book.publication_date.blank? %> + + <% end %> + + <% if !@writing_book.url.blank? %> + + <% end %> + + + + <% if @writing_book.writing_book_files.size > 0 %> + + - - + + + <% end %> +
    <%= t("writing_book") %>
    <%= t("writing_book.year")%><%= @writing_book.year %>
    <%= t("writing_book.language")%><%= @writing_book.language %>
    <%= t("writing_book.paper_title")%><%= @writing_book.paper_title %>
    <%= t("writing_book.book_title")%><%= @writing_book.book_title %>
    <%= t("writing_book.book_paper_type")%><%= @writing_book.book_paper_type.title if !@writing_book.book_paper_type.blank? %>
    <%= t("writing_book.book_author_types")%><%= @book_author_types %>
    <%= t("writing_book.extracted_chapters")%><%= @writing_book.extracted_chapters %>
    <%= t("writing_book.publisher")%><%= @writing_book.publisher %>
    <%= t("writing_book.editor")%><%= @writing_book.editor %>
    <%= t("writing_book.publish_date")%><%= @writing_book.publish_date %>
    <%= t("writing_book.pages")%><%= @writing_book.pages %>
    <%= t("writing_book.isbn")%><%= @writing_book.isbn %>
    <%= t("writing_book.publication_date")%><%= @writing_book.publication_date %>
    <%= t("writing_book.url")%><%= link_to t(:url), @writing_book.url, {:target => '_blank', :title => @writing_book.book_title} if !@writing_book.url.blank? %>
    <%= t("writing_book.note")%><%= @writing_book.note %>
    <%= t("writing_book.authors")%><%= "#{User.from_id(@writing_book.create_user_id).name rescue ''},#{@writing_book.authors rescue ''}"%>
    <%= t("writing_book.files")%> -<% if @writing_book.writing_book_files.size > 0 %> -
    - -
    +
    <%= t("module_name.personal_book") %>
    <%= t("personal_book.year")%><%= @writing_book.year %>
    <%= t("personal_book.language")%><%= @writing_book.language %>
    <%= t("personal_book.paper_title")%><%= @writing_book.paper_title %>
    <%= t("personal_book.book_title")%><%= @writing_book.book_title %>
    <%= t("personal_book.book_paper_type")%><%= @writing_book.book_paper_type.title if !@writing_book.book_paper_type.blank? %>
    <%= t("personal_book.author_type")%><%= @book_author_types %>
    <%= t("personal_book.extracted_chapters")%><%= @writing_book.extracted_chapters %>
    <%= t("personal_book.publisher")%><%= @writing_book.publisher %>
    <%= t("personal_book.editor")%><%= @writing_book.editor %>
    <%= t("personal_book.publish_date")%><%= @writing_book.publish_date %>
    <%= t("personal_book.pages")%><%= @writing_book.pages %>
    <%= t("personal_book.isbn")%><%= @writing_book.isbn %>
    <%= t("personal_book.publication_date")%><%= @writing_book.publication_date %>
    <%= t("personal_book.url")%><%= link_to t(:url), @writing_book.url, {:target => '_blank', :title => @writing_book.url} if !@writing_book.url.blank? %>
    <%= t("personal_book.authors")%><%= "#{User.from_id(@writing_book.create_user_id).name rescue ''},#{@writing_book.authors rescue ''}"%>
    <%= t("personal_book.files")%> +
    +
    + <% @writing_book.writing_book_files.each do | wjfile | %> <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %> <% end %> +
    - - <% end %> -
    diff --git a/vendor/built_in_modules/personal_book/config/locales/en.yml b/vendor/built_in_modules/personal_book/config/locales/en.yml index 9f5b05ed0..77d72755e 100644 --- a/vendor/built_in_modules/personal_book/config/locales/en.yml +++ b/vendor/built_in_modules/personal_book/config/locales/en.yml @@ -30,6 +30,8 @@ en: description : "File Description" pages : "Pages" book_paper_type : "Book Paper Type" + frontend: + writing_books: "Book Front－end" create_success : "Successfully Create" update_success : "Successfully Update" diff --git a/vendor/built_in_modules/personal_book/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_book/config/locales/zh_tw.yml index a85819c97..3c81ec625 100644 --- a/vendor/built_in_modules/personal_book/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_book/config/locales/zh_tw.yml @@ -32,6 +32,8 @@ zh_tw: book_paper_type : "專書類別" publish_date : "出版日期" editor : "主編" + frontend: + writing_books: "專書前台" create_success : "新增完成!!" update_success : "更新完成!!" 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_conferences_controller.rb similarity index 84% rename from vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_seminars_controller.rb rename to vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_conferences_controller.rb index cc41fc030..3e8350c72 100644 --- 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_conferences_controller.rb @@ -8,7 +8,7 @@ class Panel::PersonalConference::FrontEnd::WritingConferencesController < OrbitW def index - @writing_conferences = WritingConference.desc(:year).page(params[:page]).per(10) + @writing_conferences = WritingConference.where(:is_hidden => false).desc(:year,:period_start_date).page(params[:page]).per(10) 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 173ec006e..669a3af4c 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 @@ -84,9 +84,15 @@ class WritingConference end def create_link - title = ["#{self.paper_title}"] + title = [] + + title << self.authors if self.authors.present? + + pd = self.publication_date.strftime("%Y-%m-%d").split('-') + + title << pd[0] + title << self.paper_title if self.paper_title.present? title << self.conference_title if self.conference_title.present? - title << self.sponsor if self.sponsor.present? title << self.location if self.location.present? title << "#{period_start_date}-#{period_end_date}" if (self.period_start_date.present? && self.period_end_date.present?) # title << "(#{self.conference_paper_types.collect{|x| x.title}.join(', ')})" 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 84c110728..732e67e64 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 @@ -103,10 +103,9 @@
    - 匯出  - 匯入  - 新增  - 設定　 + + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path, :class => 'btn btn-primary pull-right' %>
    diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/_profile.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/_profile.html.erb index e7fde7164..a0e135032 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/_profile.html.erb @@ -1,7 +1,7 @@ <% if @member - @writing_conferences = WritingConference.where(is_hidden: false, :create_user_id => @member.id).desc(:year) + @writing_conferences = WritingConference.where(is_hidden: false, :create_user_id => @member.id).desc(:year,:period_start_date) @writing_conference_intro = !PersonalConferenceIntro.where(:user_id => @member.id).blank? ? PersonalConferenceIntro.where(:user_id => @member.id).first : PersonalConferenceIntro.new %> @@ -35,7 +35,7 @@ <%= link_to writing_conference.create_link, panel_personal_conference_front_end_writing_conference_path(writing_conference) %> - <%= writing_conference.authors %> + <%= User.find(writing_conference.create_user_id).name rescue '' %> <% end %> diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/writing_conferences/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/writing_conferences/index.html.erb index cebdabfbe..962b445ed 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/writing_conferences/index.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/writing_conferences/index.html.erb @@ -2,25 +2,31 @@ <%= flash_messages %> -

    <%= t('writing_conference.list_writing_conference') %>

    +

    <%= t('module_name.personal_conference') %>

    - - - - - - - - <% @writing_conferences.each do |post| %> - - +
    <%= t(:year) %><%= t(:title) %>
    <%= post.year %>
    + + + + + + + + + + <% @writing_conferences.each do |writing_conference| %> + + + - - - <% end %> - -
    <%= t('personal_conference.year') %><%= t('module_name.personal_conference') %><%= t('personal_conference.authors') %>
    <%= writing_conference.year %> - <%= link_to post.create_link , panel_personal_conference_front_end_writing_conference_path(post) %> + <%= link_to writing_conference.create_link, panel_personal_conference_front_end_writing_conference_path(writing_conference) %>
    + <%= User.find(writing_conference.create_user_id).name rescue '' %> + + + <% end %> + + + <%= paginate @writing_conferences, :params => {:inner => false}%> diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/writing_conferences/show.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/writing_conferences/show.html.erb index 399da4576..b4828d83e 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/writing_conferences/show.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/writing_conferences/show.html.erb @@ -1,36 +1,75 @@ <% # encoding: utf-8 %> - - - - - - - - - - - - - - - - - - - + + <% if !@writing_conference.year.blank? %> + + <% end %> + + <% if !@writing_conference.language.blank? %> + + <% end %> + + <% if !@writing_conference.paper_title.blank? %> + + <% end %> + + <% if !@writing_conference.conference_title.blank? %> + + <% end %> + + <% if !@conference_paper_types.blank? %> + + <% end %> + + <% if !@conference_author_types.blank? %> + + <% end %> + + <% if !@writing_conference.location.blank? %> + + <% end %> + + <% if !@writing_conference.sponsor.blank? %> + + <% end %> + + <% if !@writing_conference.period_start_date.blank? %> + + <% end %> + + <% if !@writing_conference.period_end_date.blank? %> + + <% end %> + + <% if !@writing_conference.abstract.blank? %> + + <% end %> + + <% if !@writing_conference.publication_date.blank? %> + + <% end %> + + <% if !@writing_conference.url.blank? %> + + <% end %> + + + + <% if @writing_conference.writing_conference_files.size > 0 %> + + - - + + + <% end %> +
    <%= t("writing_conference") %>
    <%= t("writing_conference.year")%><%= @writing_conference.year %>
    <%= t("writing_conference.language")%><%= @writing_conference.language %>
    <%= t("writing_conference.paper_title")%><%= @writing_conference.paper_title %>
    <%= t("writing_conference.conference_title")%><%= @writing_conference.conference_title %>
    <%= t("writing_conference.conference_paper_types")%><%= @conference_paper_types %>
    <%= t("writing_conference.conference_author_types")%><%= @conference_author_types %>
    <%= t("writing_conference.location")%><%= @writing_conference.location %>
    <%= t("writing_conference.sponsor")%><%= @writing_conference.sponsor %>
    <%= t("writing_conference.period_start_date")%><%= @writing_conference.period_start_date %>
    <%= t("writing_conference.period_end_date")%><%= @writing_conference.period_end_date %>
    <%= t("writing_conference.abstract")%><%= @writing_conference.abstract %>
    <%= t("writing_conference.publication_date")%><%= @writing_conference.publication_date %>
    <%= t("writing_conference.url")%><%= link_to t(:url), @writing_conference.url, {:target => '_blank', :title => @writing_conference.conference_title} if !@writing_conference.url.blank? %>
    <%= t("writing_conference.note")%><%= @writing_conference.note %>
    <%= t("writing_conference.authors")%><%= "#{User.from_id(@writing_conference.create_user_id).name rescue ''},#{@writing_conference.authors rescue ''}"%>
    <%= t("writing_conference.files")%> -<% if @writing_conference.writing_conference_files.size > 0 %> -
    - -
    +
    <%= t("module_name.personal_conference") %>
    <%= t("personal_conference.year")%><%= @writing_conference.year %>
    <%= t("personal_conference.language")%><%= @writing_conference.language %>
    <%= t("personal_conference.paper_title")%><%= @writing_conference.paper_title %>
    <%= t("personal_conference.conference_title")%><%= @writing_conference.conference_title %>
    <%= t("personal_conference.paper_type")%><%= @conference_paper_types %>
    <%= t("personal_conference.author_type")%><%= @conference_author_types %>
    <%= t("personal_conference.location")%><%= @writing_conference.location %>
    <%= t("personal_conference.sponsor")%><%= @writing_conference.sponsor %>
    <%= t("personal_conference.period_start_date")%><%= @writing_conference.period_start_date %>
    <%= t("personal_conference.period_end_date")%><%= @writing_conference.period_end_date %>
    <%= t("personal_conference.abstract")%><%= @writing_conference.abstract %>
    <%= t("personal_conference.publication_date")%><%= @writing_conference.publication_date %>
    <%= t("personal_conference.url")%><%= link_to t(:url), @writing_conference.url, {:target => '_blank', :title => @writing_conference.url} if !@writing_conference.url.blank? %>
    <%= t("personal_conference.authors")%><%= "#{User.from_id(@writing_conference.create_user_id).name rescue ''},#{@personal_conference.authors rescue ''}"%>
    <%= t("personal_conference.file")%> +
    +
    + <% @writing_conference.writing_conference_files.each do | wsfile | %> - <%= link_to wsfile.title, wsfile.file.url, {:target => '_blank', :title => wsfile.title} if wsfile.file.file %> + <%= link_to !wsfile.title.blank? ? wsfile.title : 'file', wsfile.file.url, {:target => '_blank', :title => wsfile.title} if wsfile.file.file %> <% end %> +
    - - <% end %> -
    diff --git a/vendor/built_in_modules/personal_conference/config/locales/en.yml b/vendor/built_in_modules/personal_conference/config/locales/en.yml index 5e2ee5242..273743f40 100644 --- a/vendor/built_in_modules/personal_conference/config/locales/en.yml +++ b/vendor/built_in_modules/personal_conference/config/locales/en.yml @@ -30,6 +30,8 @@ en: file : "File" file_name : "File Name" description : "File Description" + frontend: + writing_conferences: "Conference Paper Front－end" create_success : "Successfully Create" update_success : "Successfully Update" diff --git a/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml index f6b7f49e8..ec82bf693 100644 --- a/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml @@ -12,7 +12,7 @@ zh_tw: period_start_date : "起" period_end_date : "訖" location : "地點" - sponsor : "贊助" + sponsor : "主辦單位" authors : "作者" tags : "領域" keywords : "關鍵字" @@ -29,6 +29,8 @@ zh_tw: file : "檔案" file_name : "檔案名稱" description : "描述" + frontend: + writing_conferences: "研討會論文前台" create_success : "新增完成!!" update_success : "更新完成!!" diff --git a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/front_end/diplomas_controller.rb b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/front_end/diplomas_controller.rb new file mode 100644 index 000000000..d4d60391a --- /dev/null +++ b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/front_end/diplomas_controller.rb @@ -0,0 +1,17 @@ +class Panel::PersonalDiploma::FrontEnd::DiplomasController < OrbitWidgetController + + def initialize + super + @app_title = 'personal_diploma' + end + + + def index + end + + def show + @diploma = Diploma.find(params[:id]) + end + + +end diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_diploma.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_diploma.html.erb index bcba75361..a6649b774 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_diploma.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_diploma.html.erb @@ -1,7 +1,7 @@ <%= diploma.start_date.strftime("%Y.%m") %> ~ <%= diploma.end_date.strftime("%Y.%m") %> - <%= diploma.school_name %> + <%= link_to diploma.school_name, panel_personal_diploma_front_end_diploma_path(diploma) %>
    - 匯出  - 匯入  - 新增  - 設定　 + + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_diploma_back_end_diploma_path, :class => 'btn btn-primary pull-right' %> 
    - 匯出  - 匯入  - 新增  - 設定　 + + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_experience_back_end_experience_path, :class => 'btn btn-primary pull-right' %>
    diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/_profile.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/_profile.html.erb index 68ec0e5cb..74e14f9d7 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/_profile.html.erb @@ -21,8 +21,9 @@ + + - @@ -30,10 +31,11 @@ <% @experiences.each do |experience| %> + + - <% end %> diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/experiences/index.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/experiences/index.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/experiences/show.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/experiences/show.html.erb new file mode 100644 index 000000000..d696cf10e --- /dev/null +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/experiences/show.html.erb @@ -0,0 +1,42 @@ +<% # encoding: utf-8 %> + +
    <%= t('personal_experience.organizationt_title') %><%= t('personal_experience.job_title') %> <%= t('date_') %><%= t('personal_experience.organizationt_title') %>
    + <%= link_to experience.organizationt_title, panel_personal_experience_front_end_experience_path(experience) %> + <%= experience.job_title %> <%= experience.start_date.strftime("%Y.%m") %> ~ <%= experience.end_date.strftime("%Y.%m") %> - <%= link_to experience.organizationt_title, panel_personal_experience_front_end_experience_path(experience) %> -
    + + + + <% if !@experience.experience_category.blank? %> + + <% end %> + + <% if !@experience.language.blank? %> + + <% end %> + + <% if !@experience.organizationt_title.blank? %> + + <% end %> + + <% if !@experience.department.blank? %> + + <% end %> + + <% if !@experience.job_title.blank? %> + + <% end %> + + <% if !@experience.start_date.blank? %> + + <% end %> + + <% if !@experience.end_date.blank? %> + + <% end %> + + <% if !@experience.language.blank? %> + + <% end %> + + + + +
    <%= t("module_name.personal_experience") %>
    <%= t("personal_experience.experience_category")%><%= @experience.experience_category.title %>
    <%= t("personal_experience.language")%><%= @experience.language %>
    <%= t("personal_experience.organizationt_title")%><%= @experience.organizationt_title %>
    <%= t("personal_experience.department")%><%= @experience.department %>
    <%= t("personal_experience.job_title")%><%= @experience.job_title %>
    <%= t("personal_experience.start_date")%><%= @experience.start_date %>
    <%= t("personal_experience.end_date")%><%= @experience.end_date %>
    <%= t("personal_experience.url")%><%= link_to t(:url), @experience.url, {:target => '_blank', :title => @experience.url} if !@experience.url.blank? %>
    <%= t("personal_experience.authors")%><%= User.from_id(@experience.create_user_id).name rescue '' %>
    diff --git a/vendor/built_in_modules/personal_experience/config/locales/en.yml b/vendor/built_in_modules/personal_experience/config/locales/en.yml index 116508b2a..e95847200 100644 --- a/vendor/built_in_modules/personal_experience/config/locales/en.yml +++ b/vendor/built_in_modules/personal_experience/config/locales/en.yml @@ -34,6 +34,8 @@ en: description : "File Description" pages : "Pages" book_paper_type : "Book Paper Type" + frontend: + experiences: "Experience Front－end" create_success : "Successfully Create" update_success : "Successfully Update" diff --git a/vendor/built_in_modules/personal_experience/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_experience/config/locales/zh_tw.yml index 585718909..54b581cd6 100644 --- a/vendor/built_in_modules/personal_experience/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_experience/config/locales/zh_tw.yml @@ -32,6 +32,8 @@ zh_tw: file : "檔案" file_name : "檔案名稱" description : "描述" + frontend: + experiences: "經歷前台" create_success : "新增完成!!" update_success : "更新完成!!" diff --git a/vendor/built_in_modules/personal_experience/init.rb b/vendor/built_in_modules/personal_experience/init.rb index 517bceac1..1fd24c113 100644 --- a/vendor/built_in_modules/personal_experience/init.rb +++ b/vendor/built_in_modules/personal_experience/init.rb @@ -14,11 +14,11 @@ module PersonalExperience intro "I am intro" update_info 'some update_info' - # front_end do - # app_page 'experiences' do - # frontend_i18n "personal_experience.frontend.experiences" - # end - # end + front_end do + app_page 'experiences' do + frontend_i18n "personal_experience.frontend.experiences" + end + end end diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb index ad9b7f280..b2e483532 100644 --- a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb +++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb @@ -8,7 +8,7 @@ class Panel::PersonalHonor::FrontEnd::HonorsController < OrbitWidgetController def index - @honors = Honor.desc(:year).page(params[:page]).per(10) + @honors = Honor.where(:is_hidden => false).desc(:year).page(params[:page]).per(10) end diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/honor_setting.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/honor_setting.html.erb index 0ede75f73..252ee5a5a 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/honor_setting.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/honor_setting.html.erb @@ -77,10 +77,9 @@
    - 匯出  - 匯入  - 新增  - 設定　 + + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_honor_back_end_honor_path, :class => 'btn btn-primary pull-right' %>
    diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/_profile.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/_profile.html.erb index d400affd7..ad9179508 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/_profile.html.erb @@ -22,7 +22,8 @@ <%= t('personal_honor.year') %> - <%= t('personal_honor.award_name') %> + <%= t('personal_honor.award_name') %> + <%= t('personal_honor.awarding_unit') %> @@ -30,10 +31,11 @@ <% @honors.each do |honor| %> - <%= honor.year %> + <%= honor.year %> - <%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %> + <%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %> + <%= honor.awarding_unit %> <% end %> diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/index.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/index.html.erb index fc035079e..05ca539da 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/index.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/index.html.erb @@ -2,26 +2,36 @@ <%= flash_messages %> -

    <%= t('honor.list_honor') %>

    +

    <%= t('module_name.personal_honor') %>

    - - +
    + - - - + + + + + + + + + + <% @honors.each do |honor| %> + + + + + + + + + + <% end %> - <% @honors.each do |post| %> - - - - - - <% end %> - -
    <%= t(:year) %><%= t(:award_name) %>
    <%= t('personal_honor.honor_category') %><%= t('personal_honor.year') %><%= t('personal_honor.award_name') %><%= t('personal_honor.award_winner') %><%= t('personal_honor.awarding_unit') %>
    <%= honor.honor_category.title %><%= honor.year %> + <%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %> + <%= User.from_id(honor.create_user_id).name rescue '' %><%= honor.awarding_unit %>
    <%= post.year %> - <%= link_to post.award_name , panel_personal_honor_front_end_honor_path(post) %> -
    + + <%= paginate @honors, :params => {:inner => false}%> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/show.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/show.html.erb index f4b64855c..059a354a7 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/show.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/show.html.erb @@ -1,15 +1,32 @@ <% # encoding: utf-8 %> - - - - - - - - - - - + + + <% if !@honor.honor_category.blank? %> + + <% end %> + + <% if !@honor.year.blank? %> + + <% end %> + + <% if !@honor.language.blank? %> + + <% end %> + + <% if !@honor.award_name.blank? %> + + <% end %> + + <% if !@honor.awarding_unit.blank? %> + + <% end %> + + <% if !@honor.url.blank? %> + + <% end %> + + +
    <%= t("honor") %>
    <%= t("honor.category")%><%= @honor.honor_category.title if @honor.honor_category %>
    <%= t("honor.year")%><%= @honor.year %>
    <%= t("honor.language")%><%= @honor.language %>
    <%= t("honor.award_name")%><%= @honor.award_name %>
    <%= t("honor.awarding_unit")%><%= @honor.awarding_unit %>
    <%= t("honor.url")%><%= link_to t(:url), @honor.url, {:target => '_blank', :title => @honor.award_name} if !@honor.url.blank? %>
    <%= t("honor.note")%><%= @honor.note %>
    <%= t("honor.authors")%><%= User.from_id(@honor.create_user_id).name rescue '' %>
     <%= t("module_name.personal_honor") %>
    <%= t("personal_honor.honor_category")%><%= @honor.honor_category.title if @honor.honor_category %>
    <%= t("personal_honor.year")%><%= @honor.year %>
    <%= t("personal_honor.language")%><%= @honor.language %>
    <%= t("personal_honor.award_name")%><%= @honor.award_name %>
    <%= t("personal_honor.awarding_unit")%><%= @honor.awarding_unit %>
    <%= t("personal_honor.url")%><%= link_to t(:url), @honor.url, {:target => '_blank', :title => @honor.url} if !@honor.url.blank? %>
    <%= t("personal_honor.award_winner")%><%= User.from_id(@honor.create_user_id).name rescue '' %>
    diff --git a/vendor/built_in_modules/personal_honor/config/locales/en.yml b/vendor/built_in_modules/personal_honor/config/locales/en.yml index 2f71ea36b..4929ba00c 100644 --- a/vendor/built_in_modules/personal_honor/config/locales/en.yml +++ b/vendor/built_in_modules/personal_honor/config/locales/en.yml @@ -2,6 +2,7 @@ en: module_name: personal_honor: Honor personal_honor: + award_winner : "Award winner" paper_title : "Paper Title" book_title : "Book Title" award_name : "Award Name" @@ -33,6 +34,8 @@ en: description : "File Description" pages : "Pages" book_paper_type : "Book Paper Type" + frontend: + honors: "Honor Front－end" create_success : "Successfully Create" update_success : "Successfully Update" diff --git a/vendor/built_in_modules/personal_honor/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_honor/config/locales/zh_tw.yml index e5d579667..e5f85eb71 100644 --- a/vendor/built_in_modules/personal_honor/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_honor/config/locales/zh_tw.yml @@ -2,6 +2,7 @@ zh_tw: module_name: personal_honor: 榮譽 personal_honor: + award_winner : "得獎人" paper_title : "論文名稱" book_title : "期刊名稱" award_name : "獎項名稱" @@ -29,6 +30,8 @@ zh_tw: file : "檔案" file_name : "檔案名稱" description : "描述" + frontend: + honors: "榮譽前台" create_success : "新增完成!!" update_success : "更新完成!!" diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb index 1c006b460..b63c8d8bd 100644 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb @@ -8,7 +8,7 @@ class Panel::PersonalJournal::FrontEnd::WritingJournalsController < OrbitWidgetC def index - @writing_journals = WritingJournal.desc(:year).page(params[:page]).per(10) + @writing_journals = WritingJournal.where(:is_hidden => false).desc(:year, :publication_date).page(params[:page]).per(10) end diff --git a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb index 6e810cd3c..430deb43a 100644 --- a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb +++ b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb @@ -90,12 +90,19 @@ class WritingJournal end def create_link - title = ["#{self.paper_title}"] + title = [] + + title << self.authors if self.authors.present? + + pd = self.publication_date.strftime("%Y-%m-%d").split('-') + + title << pd[0] + title << self.paper_title if self.paper_title.present? title << self.journal_title if self.journal_title.present? + title << self.vol_no if (self.vol_no.present? && self.vol_no != "0") + title << self.issue_no if (self.issue_no.present? && self.issue_no != "0") + title << "pp"+self.form_to_start+"-"+self.form_to_end if (self.form_to_start.present? && self.form_to_start != "0") title << ( !self.journal_level_types.blank? ? "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})" : nil) - title << "Volume No: "+self.vol_no if (self.vol_no.present? && self.vol_no != "0") - title << "From Page: "+self.form_to_start if (self.form_to_start.present? && self.form_to_start != "0") - title << "To Page: "+self.form_to_end if (self.form_to_end.present? && self.form_to_end != "0") title.join(', ') end diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/writing_journal_setting.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/writing_journal_setting.html.erb index 62514b69f..bc86faf8e 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/writing_journal_setting.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/writing_journal_setting.html.erb @@ -128,10 +128,9 @@
    - 匯出  - 匯入  - 新增  - 設定　 + + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path, :class => 'btn btn-primary pull-right' %>
    diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/_profile.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/_profile.html.erb index 9af050c7b..8d5a6d7e5 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/_profile.html.erb @@ -1,7 +1,7 @@ <% if @member - @writing_journals = WritingJournal.where(is_hidden: false, :create_user_id => @member.id).desc(:year) + @writing_journals = WritingJournal.where(is_hidden: false, :create_user_id => @member.id).desc(:year, :publication_date) @writing_journal_intro = !PersonalJournalIntro.where(:user_id => @member.id).blank? ? PersonalJournalIntro.where(:user_id => @member.id).first : PersonalJournalIntro.new %> @@ -35,7 +35,7 @@ <%= link_to writing_journal.create_link, panel_personal_journal_front_end_writing_journal_path(writing_journal) %> - <%= writing_journal.authors %> + <%= User.find(writing_journal.create_user_id).name rescue '' %> <% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/index.html.erb index 8a1cd598a..79c37a55c 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/index.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/index.html.erb @@ -2,26 +2,33 @@ <%= flash_messages %> -

    <%= t('writing_journal.list_writing_journal') %>

    +

    <%= t('module_name.personal_journal') %>

    - - - - - +
    <%= t(:year) %><%= t(:title) %>
    + + + + + + + + - <% @writing_journals.each do |post| %> - - + <% @writing_journals.each do |writing_journal| %> + + + - - - <% end %> - -
    <%= t('personal_journal.year') %><%= t('module_name.personal_journal') %><%= t('personal_journal.authors') %>
    <%= post.year %>
    <%= writing_journal.year %> - <%= link_to post.create_link , panel_personal_journal_front_end_writing_journal_path(post) %> + <%= link_to writing_journal.create_link, panel_personal_journal_front_end_writing_journal_path(writing_journal) %>
    + <%= User.find(writing_journal.create_user_id).name rescue '' %> + + + <% end %> + + + <%= paginate @writing_journals, :params => {:inner => false}%> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/show.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/show.html.erb index febe0be48..716ff122d 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/show.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/show.html.erb @@ -1,38 +1,84 @@ <% # encoding: utf-8 %> - - - - - - - - - - - - - - - - - - - - - + + <% if !@writing_journal.year.blank? %> + + <% end %> + + <% if !@writing_journal.language.blank? %> + + <% end %> + + <% if !@writing_journal.paper_title.blank? %> + + <% end %> + + <% if !@writing_journal.journal_title.blank? %> + + <% end %> + + <% if !@writing_journal.journal_paper_type.blank? %> + + <% end %> + + <% if !@journal_level_types.blank? %> + + <% end %> + + <% if !@journal_author_types.blank? %> + + <% end %> + + <% if !@writing_journal.isbn.blank? %> + + <% end %> + + <% if !@writing_journal.vol_no.blank? %> + + <% end %> + + <% if !@writing_journal.issue_no.blank? %> + + <% end %> + + <% if !@writing_journal.form_to_start.blank? %> + + <% end %> + + <% if !@writing_journal.total_pages.blank? %> + + <% end %> + + <% if !@writing_journal.abstract.blank? %> + + <% end %> + + <% if !@writing_journal.publication_date.blank? %> + + <% end %> + + <% if !@writing_journal.url.blank? %> + + <% end %> + + + + <% if @writing_journal.writing_journal_files.size > 0 %> + + - - + + + <% end %> + +
    <%= t("writing_journal") %>
    <%= t("writing_journal.year")%><%= @writing_journal.year %>
    <%= t("writing_journal.language")%><%= @writing_journal.language %>
    <%= t("writing_journal.paper_title")%><%= @writing_journal.paper_title %>
    <%= t("writing_journal.journal_title")%><%= @writing_journal.journal_title %>
    <%= t("writing_journal.journal_paper_type")%><%= @writing_journal.journal_paper_type.title if @writing_journal.journal_paper_type %>
    <%= t("writing_journal.journal_level_types")%><%= @journal_level_types %>
    <%= t("writing_journal.journal_author_types")%><%= @journal_author_types %>
    <%= t("writing_journal.isbn")%><%= @writing_journal.isbn %>
    <%= t("writing_journal.vol_no")%><%= @writing_journal.vol_no %>
    <%= t("writing_journal.issue_no")%><%= @writing_journal.issue_no %>
    <%= t("writing_journal.form_to")%><%= "#{@writing_journal.form_to_start} ~ #{@writing_journal.form_to_end}" %>
    <%= t("writing_journal.total_pages")%><%= @writing_journal.total_pages %>
    <%= t("writing_journal.abstract")%><%= @writing_journal.abstract %>
    <%= t("writing_journal.publication_date")%><%= @writing_journal.publication_date %>
    <%= t("writing_journal.url")%><%= link_to t(:url), @writing_journal.url, {:target => '_blank', :title => @writing_journal.journal_title} if !@writing_journal.url.blank? %>
    <%= t("writing_journal.note")%><%= @writing_journal.note %>
    <%= t("writing_journal.authors")%><%= "#{User.from_id(@writing_journal.create_user_id).name rescue ''},#{@writing_journal.authors rescue ''}"%>
    <%= t("writing_journal.files")%> -<% if @writing_journal.writing_journal_files.size > 0 %> -
    - -
    +
    <%= t("module_name.personal_journal") %>
    <%= t("personal_journal.year")%><%= @writing_journal.year %>
    <%= t("personal_journal.language")%><%= @writing_journal.language %>
    <%= t("personal_journal.paper_title")%><%= @writing_journal.paper_title %>
    <%= t("personal_journal.journal_title")%><%= @writing_journal.journal_title %>
    <%= t("personal_journal.paper_type")%><%= @writing_journal.journal_paper_type.title if @writing_journal.journal_paper_type %>
    <%= t("personal_journal.level_type")%><%= @journal_level_types %>
    <%= t("personal_journal.author_type")%><%= @journal_author_types %>
    <%= t("personal_journal.isbn")%><%= @writing_journal.isbn %>
    <%= t("personal_journal.vol_no")%><%= @writing_journal.vol_no %>
    <%= t("personal_journal.issue_no")%><%= @writing_journal.issue_no %>
    <%= t("personal_journal.form_to")%><%= "#{@writing_journal.form_to_start} ~ #{@writing_journal.form_to_end}" %>
    <%= t("personal_journal.total_pages")%><%= @writing_journal.total_pages %>
    <%= t("personal_journal.abstract")%><%= @writing_journal.abstract %>
    <%= t("personal_journal.publication_date")%><%= @writing_journal.publication_date %>
    <%= t("personal_journal.url")%><%= link_to t(:url), @writing_journal.url, {:target => '_blank', :title => @writing_journal.url} if !@writing_journal.url.blank? %>
    <%= t("personal_journal.authors")%><%= "#{User.from_id(@writing_journal.create_user_id).name rescue ''},#{@writing_journal.authors rescue ''}"%>
    <%= t("personal_journal.file")%> +
    +
    + <% @writing_journal.writing_journal_files.each do | wjfile | %> - <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %> + <%= link_to !wjfile.title.blank? ? wjfile.title : 'file', wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %> <% end %> +
    - - <% end %> -
    diff --git a/vendor/built_in_modules/personal_journal/config/locales/en.yml b/vendor/built_in_modules/personal_journal/config/locales/en.yml index 2d2fc8cf8..32d9c7da3 100644 --- a/vendor/built_in_modules/personal_journal/config/locales/en.yml +++ b/vendor/built_in_modules/personal_journal/config/locales/en.yml @@ -26,6 +26,8 @@ en: file : "File" file_name : "File name" description : "File Description" + frontend: + writing_journals: "Journal Paper Front－end" create_success : "Successfully Create" update_success : "Successfully Update" diff --git a/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml index d035f05f5..ce89e2624 100644 --- a/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml @@ -19,13 +19,15 @@ zh_tw: publication_date : "發表日期" url : "參考連結" note : "記事" - level_type : "期刊類別" + level_type : "期刊等級" author_type : "作者類別" from : "起" to : "訖" file : "檔案" file_name : "檔案名稱" description : "描述" + frontend: + writing_journals: "期刊論文前台" create_success : "新增完成!!" update_success : "更新完成!!" diff --git a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/front_end/labs_controller.rb b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/front_end/labs_controller.rb new file mode 100644 index 000000000..d255c8a86 --- /dev/null +++ b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/front_end/labs_controller.rb @@ -0,0 +1,18 @@ +class Panel::PersonalLab::FrontEnd::LabsController < OrbitWidgetController + + def initialize + super + @app_title = 'personal_lab' + end + + + def index + end + + def show + @lab = Lab.find(params[:id]) + + end + + +end diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/front_end/labs/index.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/front_end/labs/index.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/front_end/labs/show.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/front_end/labs/show.html.erb new file mode 100644 index 000000000..546ac1173 --- /dev/null +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/front_end/labs/show.html.erb @@ -0,0 +1,63 @@ +<% # encoding: utf-8 %> + + + + + <% if !@lab.year.blank? %> + + <% end %> + + <% if !@lab.language.blank? %> + + <% end %> + + <% if !@lab.lab_title.blank? %> + + <% end %> + + <% if !@lab.location.blank? %> + + <% end %> + + <% if !@lab.participating_professor.blank? %> + + <% end %> + + <% if !@lab.participating_student.blank? %> + + <% end %> + + <% if !@lab.extension_no.blank? %> + + <% end %> + + <% if !@lab.research_direction.blank? %> + + <% end %> + + <% if !@lab.facility.blank? %> + + <% end %> + + <% if !@lab.language.blank? %> + + <% end %> + + + + <% if @lab.lab_files.size > 0 %> + + + + <% end %> + +
    <%= t("module_name.personal_lab") %>
    <%= t("personal_lab.year")%><%= @lab.year %>
    <%= t("personal_lab.language")%><%= @lab.language %>
    <%= t("personal_lab.lab_title")%><%= @lab.lab_title %>
    <%= t("personal_lab.location")%><%= @lab.location %>
    <%= t("personal_lab.participating_professor")%><%= @lab.participating_professor %>
    <%= t("personal_lab.participating_student")%><%= @lab.participating_student %>
    <%= t("personal_lab.extension_no")%><%= @lab.extension_no %>
    <%= t("personal_lab.research_direction")%><%= @lab.research_direction %>
    <%= t("personal_lab.facility")%><%= @lab.facility %>
    <%= t("personal_lab.url")%><%= link_to t(:url), @lab.url, {:target => '_blank', :title => @lab.url} if !@lab.url.blank? %>
    <%= t("personal_lab.authors")%><%= User.from_id(@lab.create_user_id).name rescue '' %>
    <%= t("personal_lab.file")%> +
    +
    + + <% @lab.lab_files.each do | lfile | %> + <%= link_to lfile.title, lfile.file.url, {:target => '_blank', :title => lfile.title} if lfile.file.file %> + <% end %> +
    +
    +
    diff --git a/vendor/built_in_modules/personal_lab/config/locales/en.yml b/vendor/built_in_modules/personal_lab/config/locales/en.yml index 43d38872f..ef9279d70 100644 --- a/vendor/built_in_modules/personal_lab/config/locales/en.yml +++ b/vendor/built_in_modules/personal_lab/config/locales/en.yml @@ -36,6 +36,8 @@ en: description : "File Description" pages : "Pages" book_paper_type : "Book Paper Type" + frontend: + labs: "Lab Front－end" create_success : "Successfully Create" update_success : "Successfully Update" diff --git a/vendor/built_in_modules/personal_lab/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_lab/config/locales/zh_tw.yml index 830f034d1..bbea39ca9 100644 --- a/vendor/built_in_modules/personal_lab/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_lab/config/locales/zh_tw.yml @@ -32,6 +32,8 @@ zh_tw: file : "檔案" file_name : "檔案名稱" description : "描述" + frontend: + labs: "實驗室前台" create_success : "新增完成!!" update_success : "更新完成!!" diff --git a/vendor/built_in_modules/personal_lab/init.rb b/vendor/built_in_modules/personal_lab/init.rb index f5453024a..591c64291 100644 --- a/vendor/built_in_modules/personal_lab/init.rb +++ b/vendor/built_in_modules/personal_lab/init.rb @@ -3,7 +3,20 @@ module PersonalLab module_label 'module_name.personal_lab' base_url File.expand_path File.dirname(__FILE__) personal_plugin :enable => true, :sort_number => '30', :app_name=>"Lab", :intro_app_name=>"PersonalLabIntro",:path=>"panel/personal_lab/plugin/profile",:front_path=>"panel/personal_lab/front_end/profile",:admin_path=>"/panel/personal_lab/back_end/labs",:i18n=>'module_name.personal_lab' - + + + + version "0.1" + organization "Rulingcom" + author "RD dep" + intro "I am intro" + update_info 'some update_info' + + front_end do + app_page 'labs' do + frontend_i18n "personal_lab.frontend.labs" + end + end end end diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb index 9d5f05119..baa7c2229 100644 --- a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb +++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb @@ -8,7 +8,7 @@ class Panel::PersonalPatent::FrontEnd::WritingPatentsController < OrbitWidgetCon def index - @writing_patents = WritingPatent.desc(:year).page(params[:page]).per(10) + @writing_patents = WritingPatent.where(:is_hidden=>false).desc(:publish_date).page(params[:page]).per(10) end diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb index 366247557..d25605e13 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb @@ -26,10 +26,12 @@ -
    +
    +
    <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_patent_back_end_writing_patent_setting_path, :class => 'btn btn-primary pull-right' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_patent_back_end_writing_patent_path, :class => 'btn btn-primary pull-right' %> -
    - <%= paginate @writing_patents, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
    +
    diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb index 62950247d..baae57275 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb @@ -77,10 +77,9 @@
    - 匯出  - 匯入  - 新增  - 設定　 + + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_patent_back_end_writing_patent_path, :class => 'btn btn-primary pull-right' %>
    diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/index.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/index.html.erb index 446d3d034..b3f385523 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/index.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/index.html.erb @@ -2,26 +2,36 @@ <%= flash_messages %> -

    <%= t('writing_patent.list_writing_patent') %>

    +

    <%= t('module_name.personal_patent') %>

    - - - - - +
    <%= t(:year) %><%= t(:title) %>
    + + + + + + + - - <% @writing_patents.each do |post| %> - - + + + + <% @writing_patents.each do |writing_patent| %> + + + + - - - <% end %> - -
    <%= t('personal_patent.year') %><%= t('personal_patent.patent_category') %><%= t('personal_patent.publication_date') %><%= t('personal_patent.patent_title') %><%= t('personal_patent.authors') %>
    <%= post.year %>
    <%= writing_patent.year %><%= writing_patent.writing_patent_category.title %> - <%= link_to post.patent_title , panel_personal_patent_front_end_writing_patent_path(post) %> + <%= link_to writing_patent.patent_title, panel_personal_patent_front_end_writing_patent_path(writing_patent) %>
    + <%= writing_patent.publish_date.strftime("%Y.%m") %> + <%= "#{User.from_id(writing_patent.create_user_id).name rescue ''},#{writing_patent.authors rescue ''}"%> + + + <% end %> + + + <%= paginate @writing_patents, :params => {:inner => false}%> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/show.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/show.html.erb index 018ebed0d..ea30e50ac 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/show.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/show.html.erb @@ -1,31 +1,55 @@ <% # encoding: utf-8 %> - - - - - - - - - - - - - - + + <% if !@writing_patent.year.blank? %> + + <% end %> + + <% if !@writing_patent.language.blank? %> + + <% end %> + + <% if !@writing_patent.patent_title.blank? %> + + <% end %> + + <% if !@writing_patent.writing_patent_category.blank? %> + + <% end %> + + <% if !@writing_patent.patent_no.blank? %> + + <% end %> + + <% if !@writing_patent.patent_country.blank? %> + + <% end %> + + <% if !@writing_patent.publish_date.blank? %> + + <% end %> + + <% if !@writing_patent.url.blank? %> + + <% end %> + + + + <% if @writing_patent.writing_patent_files.size > 0 %> + + - - + + + <% end %> +
    <%= t("writing_patent") %>
    <%= t("writing_patent.year")%><%= @writing_patent.year %>
    <%= t("writing_patent.language")%><%= @writing_patent.language %>
    <%= t("writing_patent.patent_title")%><%= @writing_patent.patent_title %>
    <%= t("writing_patent.category")%><%= @writing_patent.writing_patent_category.title if @writing_patent.writing_patent_category %>
    <%= t("writing_patent.patent_no")%><%= @writing_patent.patent_no %>
    <%= t("writing_patent.patent_country")%><%= @writing_patent.patent_country %>
    <%= t("writing_patent.publish_date")%><%= @writing_patent.publish_date %>
    <%= t("writing_patent.url")%><%= link_to t(:url), @writing_patent.url, {:target => '_blank', :title => @writing_patent.patent_title} if !@writing_patent.url.blank? %>
    <%= t("writing_patent.note")%><%= @writing_patent.note %>
    <%= t("writing_patent.authors")%><%= "#{User.from_id(@writing_patent.create_user_id).name rescue ''},#{@writing_patent.authors rescue ''}"%>
    <%= t("writing_patent.files")%> -<% if @writing_patent.writing_patent_files.size > 0 %> -
    - -
    +
    <%= t("module_name.personal_patent") %>
    <%= t("personal_patent.year")%><%= @writing_patent.year %>
    <%= t("personal_patent.language")%><%= @writing_patent.language %>
    <%= t("personal_patent.patent_title")%><%= @writing_patent.patent_title %>
    <%= t("personal_patent.patent_category")%><%= @writing_patent.writing_patent_category.title if @writing_patent.writing_patent_category %>
    <%= t("personal_patent.patent_no")%><%= @writing_patent.patent_no %>
    <%= t("personal_patent.patent_country")%><%= @writing_patent.patent_country %>
    <%= t("personal_patent.publication_date")%><%= @writing_patent.publish_date %>
    <%= t("personal_patent.url")%><%= link_to t(:url), @writing_patent.url, {:target => '_blank', :title => @writing_patent.url} if !@writing_patent.url.blank? %>
    <%= t("personal_patent.authors")%><%= "#{User.from_id(@writing_patent.create_user_id).name rescue ''},#{@writing_patent.authors rescue ''}"%>
    <%= t("personal_patent.file")%> +
    +
    + <% @writing_patent.writing_patent_files.each do | wjfile | %> <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %> <% end %> +
    - - <% end %> -
    diff --git a/vendor/built_in_modules/personal_patent/config/locales/en.yml b/vendor/built_in_modules/personal_patent/config/locales/en.yml index 444583e35..aee79c462 100644 --- a/vendor/built_in_modules/personal_patent/config/locales/en.yml +++ b/vendor/built_in_modules/personal_patent/config/locales/en.yml @@ -33,6 +33,8 @@ en: description : "File Description" pages : "Pages" book_paper_type : "Book Paper Type" + frontend: + writing_patents: "Patent Front－end" create_success : "Successfully Create" update_success : "Successfully Update" diff --git a/vendor/built_in_modules/personal_patent/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_patent/config/locales/zh_tw.yml index 849e24019..2d1e08f3f 100644 --- a/vendor/built_in_modules/personal_patent/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_patent/config/locales/zh_tw.yml @@ -31,6 +31,8 @@ zh_tw: file : "檔案" file_name : "檔案名稱" description : "描述" + frontend: + writing_patents: "專利前台" create_success : "新增完成!!" update_success : "更新完成!!" diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb index 08a9f8d0a..2b13ffed2 100644 --- a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb +++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb @@ -8,12 +8,10 @@ class Panel::PersonalProject::FrontEnd::ProjectsController < OrbitWidgetControll def index - @projects = Project.desc(:year).page(params[:page]).per(10) + @projects = Project.where(:is_hidden=>false).desc(:period_start_date).page(params[:page]).per(10) end - - # GET /writing_journals/1 - # GET /writing_journals/1.xml + def show @project = Project.find(params[:id]) diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/index.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/index.html.erb index a778f0888..cc8dbf8bc 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/index.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/index.html.erb @@ -26,10 +26,12 @@ -
    +
    +
    <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_project_back_end_project_setting_path, :class => 'btn btn-primary pull-right' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_project_back_end_project_path, :class => 'btn btn-primary pull-right' %> -
    - <%= paginate @projects, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
    +
    diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/project_setting.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/project_setting.html.erb index 4d4c6fe4c..b018f5df4 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/project_setting.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/project_setting.html.erb @@ -77,10 +77,9 @@
    - 匯出  - 匯入  - 新增  - 設定　 + + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_project_back_end_project_path, :class => 'btn btn-primary pull-right' %>
    diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/index.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/index.html.erb index 52ca2b16f..cf62aef5d 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/index.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/index.html.erb @@ -2,26 +2,39 @@ <%= flash_messages %> -

    <%= t('project.list_project') %>

    +

    <%= t('module_name.personal_project') %>

    - - - - - - <% @projects.each do |post| %> - - +
    <%= t(:year) %><%= t(:title) %>
    <%= post.year %>
    + + + + + + + + + + + + <% @projects.each do |project| %> + + + + - - - <% end %> - -
    <%= t('personal_project.project_category') %><%= t('personal_project.year') %><%= t('personal_project.project_title') %><%= t('personal_project.participator') %><%= t('personal_project.period') %>
    <%= project.project_category.title %><%= project.year %> - <%= link_to post.project_title , panel_personal_project_front_end_project_path(post) %> + <%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %> + <%= project.participator %>
    + <%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %> + + + <% end %> + + + + <%= paginate @projects, :params => {:inner => false}%> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/show.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/show.html.erb index 7a56673e0..a20674250 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/show.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/show.html.erb @@ -1,34 +1,67 @@ <% # encoding: utf-8 %> - - - - - - - - - - - - - - - - - + + <% if !@project.year.blank? %> + + <% end %> + + <% if !@project.language.blank? %> + + <% end %> + + <% if !@project.project_title.blank? %> + + <% end %> + + <% if !@project.job_title.blank? %> + + <% end %> + + <% if !@project.project_category.blank? %> + + <% end %> + + <% if !@project.participator.blank? %> + + <% end %> + + <% if !@project.unit.blank? %> + + <% end %> + + <% if !@project.abstract.blank? %> + + <% end %> + + <% if !@project.period_start_date.blank? %> + + <% end %> + + <% if !@project.period_end_date.blank? %> + + <% end %> + + <% if !@project.url.blank? %> + + <% end %> + + + + <% if @project.project_files.size > 0 %> + + - - + + + <% end %> +
    <%= t("project") %>
    <%= t("project.year")%><%= @project.year %>
    <%= t("project.language")%><%= @project.language %>
    <%= t("project.project_title")%><%= @project.project_title %>
    <%= t("project.job_title")%><%= @project.job_title %>
    <%= t("project.category")%><%= @project.project_category.title if @project.project_category %>
    <%= t("project.participator")%><%= @project.participator %>
    <%= t("project.unit")%><%= @project.unit %>
    <%= t("project.abstract")%><%= @project.abstract %>
    <%= t("project.period_start_date")%><%= @project.period_start_date %>
    <%= t("project.period_end_date")%><%= @project.period_end_date %>
    <%= t("project.url")%><%= link_to t(:url), @project.url, {:target => '_blank', :title => @project.title} if !@project.url.blank? %>
    <%= t("project.note")%><%= @project.note %>
    <%= t("project.authors")%><%= "#{User.from_id(@project.create_user_id).name rescue ''},#{@project.authors rescue ''}"%>
    <%= t("project.files")%> -<% if @project.project_files.size > 0 %> -
    - -
    +
    <%= t("module_name.personal_project") %>
    <%= t("personal_project.year")%><%= @project.year %>
    <%= t("personal_project.language")%><%= @project.language %>
    <%= t("personal_project.project_title")%><%= @project.project_title %>
    <%= t("personal_project.job_title")%><%= @project.job_title %>
    <%= t("personal_project.project_category")%><%= @project.project_category.title if @project.project_category %>
    <%= t("personal_project.participator")%><%= @project.participator %>
    <%= t("personal_project.unit")%><%= @project.unit %>
    <%= t("personal_project.abstract")%><%= @project.abstract %>
    <%= t("personal_project.start_date")%><%= @project.period_start_date %>
    <%= t("personal_project.end_date")%><%= @project.period_end_date %>
    <%= t("personal_project.url")%><%= link_to t(:url), @project.url, {:target => '_blank', :title => @project.url} if !@project.url.blank? %>
    <%= t("personal_project.authors")%><%= "#{User.from_id(@project.create_user_id).name rescue ''},#{@project.authors rescue ''}"%>
    <%= t("personal_project.file")%> +
    +
    + <% @project.project_files.each do | wjfile | %> <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %> <% end %> +
    - - <% end %> -
    diff --git a/vendor/built_in_modules/personal_project/config/locales/en.yml b/vendor/built_in_modules/personal_project/config/locales/en.yml index e4bc2e270..2bdca4f96 100644 --- a/vendor/built_in_modules/personal_project/config/locales/en.yml +++ b/vendor/built_in_modules/personal_project/config/locales/en.yml @@ -36,6 +36,8 @@ en: description : "File Description" pages : "Pages" book_paper_type : "Book Paper Type" + frontend: + projects: "Project Front－end" create_success : "Successfully Create" update_success : "Successfully Update" diff --git a/vendor/built_in_modules/personal_project/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_project/config/locales/zh_tw.yml index 4be3c73e5..e5adda669 100644 --- a/vendor/built_in_modules/personal_project/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_project/config/locales/zh_tw.yml @@ -36,6 +36,8 @@ zh_tw: description : "描述" pages : "Pages" book_paper_type : "Book Paper Type" + frontend: + projects: "研究計畫前台" create_success : "新增完成!!" update_success : "更新完成!!" diff --git a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb index a726dee23..59ef075e2 100644 --- a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb +++ b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb @@ -8,7 +8,7 @@ class Panel::PersonalResearch::FrontEnd::ResearchsController < OrbitWidgetContro def index - @researchs = Research.desc(:year).page(params[:page]).per(10) + @researchs = Research.where(:is_hidden=>false).desc(:publish_date).page(params[:page]).per(10) end diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/index.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/index.html.erb index 5c55084c6..707a85439 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/index.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/index.html.erb @@ -24,9 +24,11 @@ -
    +
    +
    <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_research_back_end_research_path, :class => 'btn btn-primary pull-right' %> -
    - <%= paginate @researchs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
    +
    \ No newline at end of file diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/index.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/index.html.erb index ed1664616..36347d248 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/index.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/index.html.erb @@ -2,26 +2,33 @@ <%= flash_messages %> -

    <%= t('research.list_research') %>

    +

    <%= t('module_name.personal_research') %>

    - - - - - +
    <%= t(:year) %><%= t(:title) %>
    + + + + + + + + + + <% @researchs.each do |research| %> + + + + + + + + <% end %> - <% @researchs.each do |post| %> - - - - - - <% end %> - -
    <%= t('personal_research.publication_date') %><%= t('personal_research.research_title') %><%= t('personal_research.authors') %>
    <%= research.publish_date.strftime("%Y.%m") %> + <%= link_to research.research_title, panel_personal_research_front_end_research_path(research) %> + <%= "#{User.from_id(research.create_user_id).name rescue ''},#{research.authors rescue ''}"%>
    <%= post.year %> - <%= link_to post.research_title , panel_personal_research_front_end_research_path(post) %> -
    + + <%= paginate @researchs, :params => {:inner => false}%> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/show.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/show.html.erb index 940c119d5..971f9dfec 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/show.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/show.html.erb @@ -1,29 +1,47 @@ <% # encoding: utf-8 %> - - - - - - - - - - - - - - + + + <% if !@research.year.blank? %> + + <% end %> + + <% if !@research.language.blank? %> + + <% end %> + + <% if !@research.research_title.blank? %> + + <% end %> + + <% if !@research.extracted_chapters.blank? %> + + <% end %> + + <% if !@research.publish_date.blank? %> + + <% end %> + + <% if !@research.url.blank? %> + + <% end %> + + + + <% if @research.research_files.size > 0 %> + + + + <% end %> +
    <%= t("research") %>
    <%= t("research.year")%><%= @research.year %>
    <%= t("research.language")%><%= @research.language %>
    <%= t("research.research_title")%><%= @research.research_title %>
    <%= t("research.extracted_chapters")%><%= @research.extracted_chapters %>
    <%= t("research.publish_date")%><%= @research.publish_date %>
    <%= t("research.url")%><%= link_to t(:url), @research.url, {:target => '_blank', :title => @research.journal_title} if !@research.url.blank? %>
    <%= t("research.note")%><%= @research.note %>
    <%= t("research.authors")%><%= "#{User.from_id(@research.create_user_id).name rescue ''},#{@research.authors rescue ''}"%>
    <%= t("research.files")%> -<% if @research.research_files.size > 0 %> -
    - -
    - <% @research.research_files.each do | wjfile | %> - <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %> - <% end %> -
    -
    - <% end %> -
     <%= t("module_name.personal_research") %>
    <%= t("personal_research.year")%><%= @research.year %>
    <%= t("personal_research.language")%><%= @research.language %>
    <%= t("personal_research.research_title")%><%= @research.research_title %>
    <%= t("personal_research.extracted_chapters")%><%= @research.extracted_chapters %>
    <%= t("personal_research.publication_date")%><%= @research.publish_date %>
    <%= t("personal_research.url")%><%= link_to t(:url), @research.url, {:target => '_blank', :title => @research.url} if !@research.url.blank? %>
    <%= t("personal_research.authors")%><%= "#{User.from_id(@research.create_user_id).name rescue ''},#{@research.authors rescue ''}"%>
    <%= t("personal_research.file")%> +
    +
    + + <% @research.research_files.each do | wjfile | %> + <%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %> + <% end %> +
    +
    +
    diff --git a/vendor/built_in_modules/personal_research/config/locales/en.yml b/vendor/built_in_modules/personal_research/config/locales/en.yml index ca9e50723..a2ca463e1 100644 --- a/vendor/built_in_modules/personal_research/config/locales/en.yml +++ b/vendor/built_in_modules/personal_research/config/locales/en.yml @@ -30,6 +30,8 @@ en: description : "File Description" pages : "Pages" book_paper_type : "Book Paper Type" + frontend: + researchs: "Research Front－end" create_success : "Successfully Create" update_success : "Successfully Update" diff --git a/vendor/built_in_modules/personal_research/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_research/config/locales/zh_tw.yml index 4774c15fe..4161199cb 100644 --- a/vendor/built_in_modules/personal_research/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_research/config/locales/zh_tw.yml @@ -30,6 +30,8 @@ zh_tw: description : "描述" pages : "Pages" book_paper_type : "Book Paper Type" + frontend: + researchs: "研究前台" create_success : "新增完成!!" update_success : "更新完成!!"