From c224d04a700c860f55d7df25d6ed8cfd3c87a633 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Fri, 11 Jan 2013 16:11:46 +0800 Subject: [PATCH] correct personal journal language, but now hava no language config --- .../desktop/journal_lists_controller.rb | 2 - .../desktop/journal_pages/_form.html.erb | 88 +++++++++---------- .../desktop/journal_pages/_form_file.html.erb | 12 ++- 3 files changed, 52 insertions(+), 50 deletions(-) delete mode 100644 vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_lists_controller.rb diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_lists_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_lists_controller.rb deleted file mode 100644 index b7d05a24..00000000 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_lists_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Panel::PersonalJournal::Desktop::JournalListsController < ApplicationController -end diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb index de144196..431fe8ce 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb @@ -6,23 +6,6 @@ <%= submit_tag "Cancel", :type => "button", class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %> <% end %> -
Share
@@ -46,15 +29,28 @@
  • - <%= f.text_area :paper_title, size: "20x2", placeholder: "Paper Title", class: "s_grid_6 s_grid"%> + <%= f.fields_for :paper_title_translations do |f| %> + <%= f.text_area locale, + class: "s_grid_6 s_grid", + size: "20x2", + placeholder: t("personal_journal.paper_title"), + value: (@writing_journal.paper_title_translations[locale] rescue nil) %> + <% end %>
  • - <%= f.text_field :journal_title, size: "20", placeholder: "Journal Title", class: "s_grid_6 s_grid", "autocomplete-list" => "journal_title_autocomplete_list" %> + <%= f.fields_for :journal_title_translations do |f| %> + <%= f.text_field locale, + size: "20", + placeholder: t("personal_journal.journal_title"), + class: "s_grid_6 s_grid", + "autocomplete-list" => "journal_title_autocomplete_list", + value: (@writing_journal.journal_title_translations[locale] rescue nil) %> + <% end %>
  • - <%= label_tag("", "Journal Level") %> + <%= label_tag("", t("personal_journal.level_type")) %>
      <% @level_types.each_with_index do |level_type, i| %>
    • @@ -66,23 +62,19 @@
    • <% end %>
    -
  • - <%= label_tag("", "ISSN(ISBN)", class: "s_grid_2 s_grid") %><%= f.text_field :isbn, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%> + <%= label_tag("", t("personal_journal.isbn"), class: "s_grid_2 s_grid") %><%= f.text_field :isbn, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%>
  • - <%= label_tag("", "Volume No.", class: "s_grid_2 s_grid") %><%= f.text_field :vol_no, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%> + <%= label_tag("", t("personal_journal.vol_no"), class: "s_grid_2 s_grid") %><%= f.text_field :vol_no, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%>
  • - <%= label_tag("", "Issue No.", class: "s_grid_2 s_grid") %><%= f.text_field :issue_no, size: "20", placeholder:"829872987", class: "s_grid_4 s_grid"%> + <%= label_tag("", t("personal_journal.issue_no"), class: "s_grid_2 s_grid") %><%= f.text_field :issue_no, size: "20", placeholder:"829872987", class: "s_grid_4 s_grid"%>
  • @@ -90,20 +82,28 @@
  • - <%= label_tag("", "Pages", class: "s_grid_2 s_grid") %><%= label_tag("", "from", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_start, size: "10", placeholder: "1", class: "s_grid_1 s_grid"%><%= label_tag("", "to", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_end, size: "10", placeholder: "20", class: "s_grid_1 s_grid"%> + <%= label_tag("", t("personal_journal.total_pages"), class: "s_grid_2 s_grid") %><%= label_tag("", "from", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_start, size: "10", placeholder: "1", class: "s_grid_1 s_grid"%><%= label_tag("", "to", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_end, size: "10", placeholder: "20", class: "s_grid_1 s_grid"%>
  • - <%= f.text_area :authors, size: "20x2", placeholder: "Authors", class: "s_grid_6 s_grid", "autocomplete-list" => "coauthor_autocomplete_list"%> + <%= f.fields_for :authors_translations do |f| %> + <%= f.text_area locale, + class: "s_grid_6 s_grid", + size: "20x2", + placeholder: t("web_resource.authors"), + "autocomplete-list" => "coauthor_autocomplete_list", + value: (@writing_journal.authors_translations[locale] rescue nil) %> + <% end %>
  • <%= options_for_select( - @paper_types.map do |paper_type| - [paper_type.title, paper_type.id] - end - ) - %> + [t("personal_journal.level_type")] + + @paper_types.map do |paper_type| + [paper_type.title, paper_type.id] + end + ) + %>
  • - <%= label_tag("", "Date of Publication", class: "s_grid_3 s_grid") %> + <%= label_tag("", t("personal_journal.publication_date"), class: "s_grid_3 s_grid") %> <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %>
  • - <%= f.text_field :keywords, size: "20", value: @writing_journal.keywords ||= "Keywords", class: "s_grid_6 s_grid"%> + <%= f.text_field :keywords, size: "20", placeholder: t("personal_journal.keywords"), class: "s_grid_6 s_grid"%>
  • - <%= f.label :year ,:class => "s_grid_2 s_grid" %> + <%= f.label :year, t("personal_journal.year"), :class => "s_grid_2 s_grid" %> <%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_4 s_grid"} ) %>
  • - <%= f.label :language ,:class => "s_grid_2 s_grid" %> -
  • @@ -214,8 +212,6 @@ orbitDesktop.prototype.initializeJournalPapers.coauthor_autocomplete_list = <%= @co_author_candidate.to_json.html_safe %>; - -<%= javascript_include_tag "archive_plugin_form" %>