From 16fda25ace51da0038fd45883c0b694161f12103 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Wed, 20 Feb 2013 16:02:54 +0800 Subject: [PATCH] done personal conference add/edit page --- .../desktop/conference_pages_controller.rb | 1 + .../desktop/conference_pages/_form.html.erb | 207 +++++++++++------- .../desktop/conference_pages/new.html.erb | 109 +-------- .../desktop/conference_window.html.erb | 2 +- .../personal_conference/config/locales/en.yml | 3 +- .../config/locales/zh_tw.yml | 3 +- 6 files changed, 142 insertions(+), 183 deletions(-) diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb index 42dd5163..2bf75b43 100644 --- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb +++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb @@ -14,6 +14,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio def new @writing_conference = WritingConference.new @paper_types = ConferencePaperType.all + @author_types = ConferenceAuthorType.all #@co_author_candidate = # CoAuthor.where(name_id: current_user.id).map{|c|c.co_author} #@conference_candidate = diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb index 8b30adcc..472c405a 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb @@ -1,90 +1,149 @@
-
+
<%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %> <% if not @writing_conference.new_record? %> <%= submit_tag t("cancel"), :type => "button", class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %> <% end %> -
-
-
-
+
+
+
Share
+
+ +
+
+
+
+
-
-
-
-
-
    -
  • - <%= 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 %> -
    • -
  • - OralPoster
    • -
    • - -
  • - - - - - -
    • +
    +
    +
    +
    +
      +
    • + <%= f.fields_for :paper_title_translations do |f| %> + <%= f.text_area locale, + class: "s_grid_6 s_grid", + size: "20x2", + placeholder: t("personal_conference.paper_title"), + value: (@writing_conference.paper_title_translations[locale] rescue nil) %> + <% end %> +
      • -
      • -
      • +
    • + <%= f.fields_for :conference_title_translations do |f| %> + <%= f.text_field locale, + size: "20", + placeholder: t("personal_conference.conference_title"), + class: "s_grid_6 s_grid", +# "autocomplete-list" => "conference_title_autocomplete_list", + value: (@writing_conference.conferece_title_translations[locale] rescue nil) %> + <% end %> + +
      • -
    -
    -
    -
      -
      • -
    • - - -
      • +
      + <%= label_tag("", t("personal_conference.paper_type")) %> +
        + <% @paper_types.each_with_index do |paper_type, i| %> +
      • + <%= radio_button_tag "writing_conference[conference_paper_type_ids][]", + paper_type.id, + @writing_conference.conference_paper_type_ids.include?(paper_type.id), + id: "field-#{i}" + %><%= label_tag("field-#{i}", paper_type.title) %> +
        • + <% end %> +
      +
      -
      • +
    • + <%= f.text_field :keywords, size: "20", placeholder: t("personal_conference.keywords"), class: "s_grid_6 s_grid"%> +
      • -
      • -
      • -
      • -
      • -
      • +
      + <%= label_tag("", t("personal_conference.conference_time")) %> +
        +
      • + <%= label_tag("", t("personal_conference.period_start_date"), class: "s_grid_1 s_grid") %> + <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %> +
        • +
      • + <%= label_tag("", t("personal_conference.period_end_date"), class: "s_grid_1 s_grid") %> + <%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %> +
        • +
      +
      -
    -
    -
    -
      -
      • -
      • -
    -
    -
    +
  • + <%= label_tag("", t("personal_conference.sponsor"), class: "s_grid_2 s_grid") %><%= f.text_field :sponsor, size: "20", placeholder: "Sponsor", class: "s_grid_4 s_grid"%> +
    • +
  • + <%= label_tag("", t("personal_conference.location"), class: "s_grid_2 s_grid") %><%= f.text_field :location, size: "20", placeholder: "Location", class: "s_grid_4 s_grid"%> +
    • + +
  • + <%= label_tag("", t("personal_conference.url"), class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%> +
    • + +
    +
      +
    • + <%= f.fields_for :authors_translations do |f| %> + <%= f.text_area locale, + class: "s_grid_6 s_grid", + size: "20x2", + placeholder: t("personal_conference.authors"), +# "autocomplete-list" => "coauthor_autocomplete_list", + value: (@writing_conference.authors_translations[locale] rescue nil) %> + <% end %> + + + + + +
      • + +
    • + <%= label_tag("", t("personal_conference.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_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_6 s_grid full_height"%> +
      • +
    +
    +
    +
  • +
      + <%= f.text_area :note, size: "20x22", placeholder: t("personal_journal.note"), class: "s_grid_6 s_grid full_height"%> +
    +
    • +
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb index 28283456..eb8f8751 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb @@ -1,107 +1,4 @@ -
-
- - -
-
-
Year
-
- -
-
-
-
Language
-
- -
-
-
-
-
-
-
-
-
-
-
-
    -
    • -
  • - OralPoster
    • -
    • - -
  • - - - - - -
    • +<%= form_for @writing_conference, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_conference_desktop_conference_pages_path do |f| %> + <%= render partial: 'panel/personal_conference/desktop/conference_pages/form', locals: {:f => f} %> +<%end%> -
    • -
    • - -
-
-
-
    -
    • -
  • - - -
    • - -
    • - -
    • -
    • -
    • -
    • -
    • - - -
-
-
-
    -
    • -
    • -
-
-
-
-
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb index a45573a6..60164125 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb @@ -13,7 +13,7 @@
    -
  • List
    • +
  • List
  • Add/Edit
  • Conference
  • Co-Authors
    • 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 260f4fd5..b137de64 100644 --- a/vendor/built_in_modules/personal_conference/config/locales/en.yml +++ b/vendor/built_in_modules/personal_conference/config/locales/en.yml @@ -6,6 +6,7 @@ en: paper_title : "Paper Title" paper_type : "Paper Type" conference_title : "Conference Name" + conference_time: "Conference Time" period_start_date : "Start Date" period_end_date : "End Date" location : "Location" @@ -22,7 +23,7 @@ en: publication_date : "Date of Publication" url : "Reference URL" note : "Note" -# author_type : "Author Type" + author_type : "Author Type" file : "File" file_name : "File Name" description : "File Description" 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 0a977b91..6d10cf65 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 @@ -6,6 +6,7 @@ zh_tw: paper_title : "論文名稱" paper_type : "論文型態" conference_title : " 會議名稱" + conference_time: "會議時間" period_start_date : "起" period_end_date : "訖" location : "地點" @@ -22,7 +23,7 @@ zh_tw: publication_date : "發表日期" url : "參考連結" note : "記事" -# author_type : "作者類別" + author_type : "作者類別" file : "檔案" file_name : "檔案名稱" description : "描述"