From 40831d3b8c69d943495f7d1436b5f18c4c335b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= Date: Wed, 28 Feb 2024 10:17:14 +0800 Subject: [PATCH] Fix indent. --- app/helpers/admin/seminars_field_helper.rb | 2 +- .../_attribute_submission_field.html.erb | 1 + .../seminars/seminar_signup_field.html.erb | 16 ++++++++-------- .../seminars/seminar_submission_field.html.erb | 14 +++++++------- config/locales/en.yml | 17 +++++++++-------- config/locales/zh_tw.yml | 16 ++++++++-------- 6 files changed, 34 insertions(+), 32 deletions(-) diff --git a/app/helpers/admin/seminars_field_helper.rb b/app/helpers/admin/seminars_field_helper.rb index 21ffe5c..1ab35e5 100644 --- a/app/helpers/admin/seminars_field_helper.rb +++ b/app/helpers/admin/seminars_field_helper.rb @@ -26,7 +26,7 @@ module Admin::SeminarsFieldHelper end def lang_tab(str,lang) - content_tag(:div,str,:class=>"tab-pane fade",:id=>(get_field_name_base+"tab_#{lang}")) + content_tag(:div,str,:class=>"tab-pane fade",:id=>(get_field_name_base+"tab_#{lang}")) end def render_address diff --git a/app/views/admin/seminars/_attribute_submission_field.html.erb b/app/views/admin/seminars/_attribute_submission_field.html.erb index 12eadb1..7373e4c 100644 --- a/app/views/admin/seminars/_attribute_submission_field.html.erb +++ b/app/views/admin/seminars/_attribute_submission_field.html.erb @@ -128,6 +128,7 @@ <%= content_tag :div,:class=>"field-type default fade in #{show_seminar_type_panel(attribute_submission_field,"typeE")}" do%> <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:field_name=>"#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][typeE][option_list]",:values=>attribute_submission_field["typeE"]["option_list"]}%> <% end if show_seminar_type_panel(attribute_submission_field,"typeE") != 'typeE hide' %> + <%= content_tag :div,:class=>"field-type default fade in #{show_seminar_type_panel(attribute_submission_field,"typeF")}" do%>
diff --git a/app/views/admin/seminars/seminar_signup_field.html.erb b/app/views/admin/seminars/seminar_signup_field.html.erb index a4c2359..0048bd9 100644 --- a/app/views/admin/seminars/seminar_signup_field.html.erb +++ b/app/views/admin/seminars/seminar_signup_field.html.erb @@ -1,16 +1,16 @@ <% content_for :page_specific_css do -%> - <%= stylesheet_link_tag "lib/wrap-nav.css" %> - <%= stylesheet_link_tag "lib/pageslide.css" %> - <%= stylesheet_link_tag "lib/main-forms.css" %> - <%= stylesheet_link_tag "lib/togglebox.css" %> + <%= stylesheet_link_tag "lib/wrap-nav.css" %> + <%= stylesheet_link_tag "lib/pageslide.css" %> + <%= stylesheet_link_tag "lib/main-forms.css" %> + <%= stylesheet_link_tag "lib/togglebox.css" %> <% end -%> <% content_for :page_specific_javascript do -%> - <%= javascript_include_tag "lib/jquery.tmpl.min.js" %> - <%= javascript_include_tag "seminar-field-forms.js" %> + <%= javascript_include_tag "lib/jquery.tmpl.min.js" %> + <%= javascript_include_tag "seminar-field-forms.js" %> <% end -%> -<%= form_for @attribute,:url => admin_seminar_path(@attribute) , :html => { :class=> "form-horizontal main-forms" } do |f| %> +<%= form_for @attribute, url: admin_seminar_path(@attribute) , html: { class: "form-horizontal main-forms" } do |f| %> <% if flash.now[:notice].present? %> <%= flash.now[:notice]%> <% end %> @@ -19,7 +19,7 @@
- <%= render partial: "attribute_field",collection: @attribute.seminar_signup_fields.asc(:sort_number, :_id)%> + <%= render partial: "attribute_field", collection: @attribute.seminar_signup_fields.asc(:sort_number, :_id)%>
diff --git a/app/views/admin/seminars/seminar_submission_field.html.erb b/app/views/admin/seminars/seminar_submission_field.html.erb index 9e7a942..1143236 100644 --- a/app/views/admin/seminars/seminar_submission_field.html.erb +++ b/app/views/admin/seminars/seminar_submission_field.html.erb @@ -1,15 +1,15 @@ <% content_for :page_specific_css do -%> - <%= stylesheet_link_tag "lib/wrap-nav.css" %> - <%= stylesheet_link_tag "lib/pageslide.css" %> - <%= stylesheet_link_tag "lib/main-forms.css" %> - <%= stylesheet_link_tag "lib/togglebox.css" %> + <%= stylesheet_link_tag "lib/wrap-nav.css" %> + <%= stylesheet_link_tag "lib/pageslide.css" %> + <%= stylesheet_link_tag "lib/main-forms.css" %> + <%= stylesheet_link_tag "lib/togglebox.css" %> <% end -%> <% content_for :page_specific_javascript do -%> - <%= javascript_include_tag "lib/jquery.tmpl.min.js" %> - <%= javascript_include_tag "seminar-field-forms-submission.js" %> + <%= javascript_include_tag "lib/jquery.tmpl.min.js" %> + <%= javascript_include_tag "seminar-field-forms-submission.js" %> <% end -%> -<%= form_for @attribute,:url => admin_seminar_path(@attribute) , :html => { :class=> "form-horizontal main-forms" } do |f| %> +<%= form_for @attribute, url: admin_seminar_path(@attribute) , html: { class: "form-horizontal main-forms" } do |f| %> <% if flash.now[:notice].present? %> <%= flash.now[:notice]%> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index c316bfa..3e23680 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5,7 +5,8 @@ en: label: "" lists: markups: - seminar_preferred_session: Preferred Session + seminar_preferred_session: Preferred Session + restful_actions: edit_seminar_review: Review copy: Copy @@ -46,12 +47,12 @@ en: home_setting: Home Setting sub_page_setting: Sub Page Setting menu: - introduction: Introduction - news: News - registration: Registration - registered_participants: Registered Participants - submission: Submission - album: Album + introduction: Introduction + news: News + registration: Registration + registered_participants: Registered Participants + submission: Submission + album: Album introduction: Introduction announcement_limit: Announcement ;imit album_limit: Album limit @@ -160,7 +161,7 @@ en: contribute_file_count: Count of Contribute Files #投稿檔案數 frontend: - seminar: Semianr #研討會前台 + seminar: Semianr #研討會前台 seminar_item: new_item: New Item #新增項目 diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index a31cc88..43649b1 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -5,7 +5,7 @@ zh_tw: label: "" lists: markups: - seminar_preferred_session: Preferred Session + seminar_preferred_session: Preferred Session restful_actions: edit_seminar_review: 審查 @@ -47,12 +47,12 @@ zh_tw: home_setting: 首頁設定 sub_page_setting: 內頁設定 menu: - introduction: 介紹 - news: 公告 - registration: 註冊 - registered_participants: 註冊參與者 - submission: 投稿 - album: 相簿 + introduction: 介紹 + news: 公告 + registration: 註冊 + registered_participants: 註冊參與者 + submission: 投稿 + album: 相簿 introduction: 介紹 announcement_limit: 公告上限 album_limit: 相簿上限 @@ -161,7 +161,7 @@ zh_tw: contribute_file_count: 投稿檔案數 frontend: - seminar: 研討會前台 + seminar: 研討會前台 seminar_item: new_item: 新增項目