From 9b16620b0ba062a5c184bbfa08afdc16ee0192d4 Mon Sep 17 00:00:00 2001 From: chiu Date: Mon, 19 Aug 2019 16:23:18 +0800 Subject: [PATCH 01/17] Update zh_tw.yml add translation --- config/locales/zh_tw.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 9a1e340..27c7b18 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -3,6 +3,9 @@ zh_tw: module_name: personal_conference: 研討會論文 personal_conference: + select_class: "——選取分類——" + search_class: "搜尋類別:" + word_to_search: "關鍵字搜尋:" year : "年度" language : "語言" paper_title : "論文名稱" From e6bfdda9bf7f7e1d6ca2e3260b28a91fff545bc0 Mon Sep 17 00:00:00 2001 From: chiu Date: Mon, 19 Aug 2019 16:23:53 +0800 Subject: [PATCH 02/17] Update en.yml add translation --- config/locales/en.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 196285b..9e8fa4a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4,6 +4,9 @@ en: personal_conference: Conference Paper personal_conference: + select_class: "——select class——" + search_class: "search class:" + word_to_search: "word to search:" year : "Year" language : "Language" paper_title : "Paper Title" From f1fa503b8bd34cab3ba71ab9774b56f5f1584a97 Mon Sep 17 00:00:00 2001 From: chiu Date: Mon, 19 Aug 2019 16:27:46 +0800 Subject: [PATCH 03/17] =?UTF-8?q?Update=20personal=5Fconferences=5Fcontrol?= =?UTF-8?q?ler.rb=20=E6=90=9C=E5=B0=8B=E6=94=B9=E7=82=BA=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=9A=E5=9C=8B=E8=AA=9E=E8=A8=80=20coding=20style=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personal_conferences_controller.rb | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb index 362dacd..6d0e371 100644 --- a/app/controllers/personal_conferences_controller.rb +++ b/app/controllers/personal_conferences_controller.rb @@ -1,12 +1,8 @@ class PersonalConferencesController < ApplicationController - def search_all_words(target,word) - target=target.upcase - words=word.upcase.split(' ') - return words.select{|value| target.include? value}==words - end def index params = OrbitHelper.params - writing_conferences = WritingConference.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count) + page_data_count = OrbitHelper.page_data_count + writing_conferences = WritingConference.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count) page = Page.where(:page_id => params[:page_id]).first rescue nil if page.custom_string_field == "table" fields_to_show = page.custom_array_field rescue [] @@ -53,8 +49,8 @@ class PersonalConferencesController < ApplicationController else page_to_show = params[:page_no].to_i end - writing_conferences = writing_conferences_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count] - writing_conferences_total_pages = (writing_conferences_show.length/OrbitHelper.page_data_count.to_f).ceil + writing_conferences = writing_conferences_show[(page_to_show-1)*page_data_count...page_to_show*page_data_count] + writing_conferences_total_pages = (writing_conferences_show.length/page_data_count.to_f).ceil else writing_conferences_total_pages = writing_conferences.total_pages end @@ -103,13 +99,13 @@ class PersonalConferencesController < ApplicationController choice_select=choice_value.map{|iter| iter==params[:selectbox] ? "selected" : ""} choice_select=choice_select.map{|value| {"choice_select" => value}} choice_value=choice_value.map{|value| {"choice_value" => value}} - choice_default = params[:locale]!='en' ? "——選取分類——" : "——select class——" + choice_default = t("personal_conference.select_class") choice_show.unshift(choice_default) choice_show=choice_show.map{|value| {"choice_show" => value}} choice=choice_value.zip(choice_show,choice_select) choice=choice.map{|value| value.inject:merge} - select_text = params[:locale]!='en' ? "搜尋類別:" : "search class:" - search_text = params[:locale]!='en' ? "關鍵字搜尋:" : "word to search:" + select_text = t("personal_conference.search_class") + search_text = t("personal_conference.word_to_search") { "writing_conferences" => writing_conference_list, "extras" => { "widget-title" => t("module_name.personal_conference"), @@ -194,4 +190,10 @@ class PersonalConferencesController < ApplicationController page.save render :json => {"success" => true}.to_json end +private + def search_all_words(target,word) + target=target.upcase + words=word.upcase.split(' ') + return words.select{|value| target.include? value}==words + end end \ No newline at end of file From 67e928b4e9d9b9b34ebbbfd66e3e8f35e6a99aec Mon Sep 17 00:00:00 2001 From: chiu Date: Mon, 19 Aug 2019 16:48:36 +0800 Subject: [PATCH 04/17] Update writing_conference.rb fix error --- app/models/writing_conference.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/writing_conference.rb b/app/models/writing_conference.rb index 025425f..e700cff 100644 --- a/app/models/writing_conference.rb +++ b/app/models/writing_conference.rb @@ -192,8 +192,8 @@ class WritingConference files = [] self.writing_conference_files.each do |conference_files| url = conference_files.file.url - title = (conference_files.title.blank? ? File.basename(conference_files.file.path) : conference_files.title) - files << "
  • #{title}
    • " + title = ((conference_files.title.blank? ? File.basename(conference_files.file.path) : conference_files.title) rescue "") + files << (url.nil? ? "" : "
  • #{title}
    • ") end value = files.join("") else From 12d438223d02aba454ccd7be86a1b2e734a892d7 Mon Sep 17 00:00:00 2001 From: chiu Date: Tue, 20 Aug 2019 12:16:44 +0800 Subject: [PATCH 05/17] Update personal_conferences_controller.rb fix coding style --- .../personal_conferences_controller.rb | 283 +++++++++--------- 1 file changed, 143 insertions(+), 140 deletions(-) diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb index 6d0e371..f4ca297 100644 --- a/app/controllers/personal_conferences_controller.rb +++ b/app/controllers/personal_conferences_controller.rb @@ -2,55 +2,57 @@ class PersonalConferencesController < ApplicationController def index params = OrbitHelper.params page_data_count = OrbitHelper.page_data_count - writing_conferences = WritingConference.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count) - page = Page.where(:page_id => params[:page_id]).first rescue nil - if page.custom_string_field == "table" + writing_conferences = WritingConference.where(is_hidden: false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count) + page = Page.where(page_id: params[:page_id]).first rescue nil + if page.custom_string_field == 'table' fields_to_show = page.custom_array_field rescue [] - fields_to_show = [ - "authors", - "paper_title", - "conference_title", - "location", - "paper_types", - "paper_levels" - ] if fields_to_show.blank? + if fields_to_show.blank? + fields_to_show = %w[ + authors + paper_title + conference_title + location + paper_types + paper_levels + ] + end else - fields_to_show = [ - "year", - "paper_title" + fields_to_show = %w[ + year + paper_title ] end - if params[:selectbox] !=nil - writing_conferences_temp = WritingConference.where(:is_hidden=>false).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] } + if !params[:selectbox].nil? + writing_conferences_temp = WritingConference.where(is_hidden: false).sort_by { |tp| [-tp[:year].to_i, -tp[:publication_date].to_i] } case params[:selectbox] - when "paper_title","default" - if page.custom_string_field == "table" - writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.paper_title, params[:keywords])} + when 'paper_title', 'default' + if page.custom_string_field == 'table' + writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.paper_title, params[:keywords]) } else - writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.create_link, params[:keywords])} + writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.create_link, params[:keywords]) } end - when "paper_levels" - writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.conference_paper_levels.collect{|x| x.title}.join(', ').to_s, params[:keywords])} - when "paper_types" - writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.conference_paper_types.collect{|x| x.title}.join(', ').to_s, params[:keywords])} - when "period" - writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.duration, params[:keywords])} - when "publication_date" - writing_conferences_show = writing_conferences_temp.select {|value| search_all_words((value.send("publication_date").strftime("%Y/%m/%d") rescue ""), params[:keywords])} - when "author_type" - writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.conference_author_types.collect{|cat| cat.title}.join(", "), params[:keywords])} - when "language" - writing_conferences_show = writing_conferences_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])} + when 'paper_levels' + writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.conference_paper_levels.collect(&:title).join(', ').to_s, params[:keywords]) } + when 'paper_types' + writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.conference_paper_types.collect(&:title).join(', ').to_s, params[:keywords]) } + when 'period' + writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.duration, params[:keywords]) } + when 'publication_date' + writing_conferences_show = writing_conferences_temp.select { |value| search_all_words((value.send('publication_date').strftime('%Y/%m/%d') rescue ''), params[:keywords]) } + when 'author_type' + writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.conference_author_types.collect(&:title).join(', '), params[:keywords]) } + when 'language' + writing_conferences_show = writing_conferences_temp.select { |value| search_all_words((!value.language.nil? ? t(value.language.to_s) : ''), params[:keywords]) } else - writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords])} + writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords]) } end - if params[:page_no].nil? - page_to_show = 1 - else - page_to_show = params[:page_no].to_i - end - writing_conferences = writing_conferences_show[(page_to_show-1)*page_data_count...page_to_show*page_data_count] - writing_conferences_total_pages = (writing_conferences_show.length/page_data_count.to_f).ceil + page_to_show = if params[:page_no].nil? + 1 + else + params[:page_no].to_i + end + writing_conferences = writing_conferences_show[(page_to_show - 1) * page_data_count...page_to_show * page_data_count] + writing_conferences_total_pages = (writing_conferences_show.length / page_data_count.to_f).ceil else writing_conferences_total_pages = writing_conferences.total_pages end @@ -59,141 +61,142 @@ class PersonalConferencesController < ApplicationController t = [] fields_to_show.each do |fs| case fs - when "paper_title" - if page.custom_string_field == "table" - t << {"value" => "#{writing_conference.paper_title}"} + when 'paper_title' + if page.custom_string_field == 'table' + t << { 'value' => "#{writing_conference.paper_title}" } else - t << {"value" => "#{writing_conference.create_link}"} + t << { 'value' => "#{writing_conference.create_link}" } end - when "paper_levels" - t << {"value" => ( !writing_conference.conference_paper_levels.blank? ? "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})" : nil)} - when "paper_types" - t << {"value" => ( !writing_conference.conference_paper_types.blank? ? "(#{writing_conference.conference_paper_types.collect{|x| x.title}.join(', ')})" : nil)} - when "publication_date" - t << {"value" => (writing_conference.send(fs).strftime("%Y/%m") rescue "")} - when "author_type" - t << {"value" => (writing_conference.conference_author_types.collect{|cat| cat.title}.join(", ") rescue "")} - when "period" - t << {"value" => writing_conference.duration} - when "language" - t << {"value" => (!writing_conference.language.nil? ? t("#{writing_conference.language}") : "")} + when 'paper_levels' + t << { 'value' => (!writing_conference.conference_paper_levels.blank? ? "(#{writing_conference.conference_paper_levels.collect(&:title).join(', ')})" : nil) } + when 'paper_types' + t << { 'value' => (!writing_conference.conference_paper_types.blank? ? "(#{writing_conference.conference_paper_types.collect(&:title).join(', ')})" : nil) } + when 'publication_date' + t << { 'value' => (writing_conference.send(fs).strftime('%Y/%m') rescue '') } + when 'author_type' + t << { 'value' => (writing_conference.conference_author_types.collect(&:title).join(', ') rescue '') } + when 'period' + t << { 'value' => writing_conference.duration } + when 'language' + t << { 'value' => (!writing_conference.language.nil? ? t(writing_conference.language.to_s) : '') } else - t << {"value" => writing_conference.send(fs)} + t << { 'value' => writing_conference.send(fs) } end end - writing_conference_list << {"cps" => t} + writing_conference_list << { 'cps' => t } end choice_show = [] headers = [] fields_to_show.each do |fs| col = 2 - col = 3 if fs == "paper_title" + col = 3 if fs == 'paper_title' headers << { - "head-title" => t("personal_conference.#{fs}"), - "col" => col + 'head-title' => t("personal_conference.#{fs}"), + 'col' => col } choice_show << t("personal_conference.#{fs}") end choice_value = fields_to_show - choice_value.unshift("default") - choice_select=choice_value.map{|iter| iter==params[:selectbox] ? "selected" : ""} - choice_select=choice_select.map{|value| {"choice_select" => value}} - choice_value=choice_value.map{|value| {"choice_value" => value}} - choice_default = t("personal_conference.select_class") + choice_value.unshift('default') + choice_select = choice_value.map { |iter| iter == params[:selectbox] ? 'selected' : '' } + choice_select = choice_select.map { |value| { 'choice_select' => value } } + choice_value = choice_value.map { |value| { 'choice_value' => value } } + choice_default = t('personal_conference.select_class') choice_show.unshift(choice_default) - choice_show=choice_show.map{|value| {"choice_show" => value}} - choice=choice_value.zip(choice_show,choice_select) - choice=choice.map{|value| value.inject:merge} - select_text = t("personal_conference.search_class") - search_text = t("personal_conference.word_to_search") + choice_show = choice_show.map { |value| { 'choice_show' => value } } + choice = choice_value.zip(choice_show, choice_select) + choice = choice.map { |value| value.inject :merge } + select_text = t('personal_conference.search_class') + search_text = t('personal_conference.word_to_search') { - "writing_conferences" => writing_conference_list, - "extras" => { "widget-title" => t("module_name.personal_conference"), - "url" => "/"+params[:locale]+params[:url], - "select_text" => select_text, - "search_text" => search_text, - "search_value" => params[:keywords] }, - "headers" => headers, - "total_pages" => writing_conferences_total_pages, - "choice" => choice + 'writing_conferences' => writing_conference_list, + 'extras' => { 'widget-title' => t('module_name.personal_conference'), + 'url' => '/' + params[:locale] + params[:url], + 'select_text' => select_text, + 'search_text' => search_text, + 'search_value' => params[:keywords] }, + 'headers' => headers, + 'total_pages' => writing_conferences_total_pages, + 'choice' => choice } end def show params = OrbitHelper.params - plugin = WritingConference.where(:is_hidden=>false).find_by(uid: params[:uid]) - - fields_to_show = [ - "year", - "authors", - "paper_title", - "conference_title", - "location", - "period_start_date", - "period_end_date", - "period", - "paper_type", - "paper_level", - "sponsor", - "author_type", - "number_of_authors", - "abstract", - "url", - "file", - "publication_date", - "isbn", - "isi_number" , - "language" + plugin = WritingConference.where(is_hidden: false).find_by(uid: params[:uid]) + fields_to_show = %w[ + year + authors + paper_title + conference_title + location + period_start_date + period_end_date + period + paper_type + paper_level + sponsor + author_type + number_of_authors + abstract + url + file + publication_date + isbn + isi_number + language ] - - {"plugin_datas"=>plugin.get_plugin_data(fields_to_show)} + + { 'plugin_datas' => plugin.get_plugin_data(fields_to_show) } end def get_fields_for_index @page = Page.find(params[:page_id]) rescue nil - @fields_to_show = [ - "year", - "authors", - "paper_title", - "conference_title", - "location", - "period_start_date", - "period_end_date", - "period", - "paper_type", - "paper_level", - "sponsor", - "author_type", - "number_of_authors", - "abstract", - "url", - "publication_date", - "isbn", - "isi_number" , - "language" + @fields_to_show = %w[ + year + authors + paper_title + conference_title + location + period_start_date + period_end_date + period + paper_type + paper_level + sponsor + author_type + number_of_authors + abstract + url + publication_date + isbn + isi_number + language ] - @fields_to_show = @fields_to_show.map{|fs| [t("personal_conference.#{fs}"), fs] } - @default_fields_to_show = [ - "authors", - "paper_title", - "conference_title", - "location", - "paper_types", - "paper_levels" + @fields_to_show = @fields_to_show.map { |fs| [t("personal_conference.#{fs}"), fs] } + @default_fields_to_show = %w[ + authors + paper_title + conference_title + location + paper_types + paper_levels ] - render :layout => false + render layout: false end def save_index_fields page = Page.find(params[:page_id]) rescue nil page.custom_array_field = params[:keys] page.save - render :json => {"success" => true}.to_json + render json: { 'success' => true }.to_json end -private - def search_all_words(target,word) - target=target.upcase - words=word.upcase.split(' ') - return words.select{|value| target.include? value}==words + + private + + def search_all_words(target, word) + target = target.upcase + words = word.upcase.split(' ') + words.select { |value| target.include? value } == words end end \ No newline at end of file From 492c0585b46a833a13ab3661be0529808bc95d10 Mon Sep 17 00:00:00 2001 From: chiu Date: Tue, 20 Aug 2019 14:15:26 +0800 Subject: [PATCH 06/17] Update personal_conferences_controller.rb fix style --- app/controllers/personal_conferences_controller.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb index f4ca297..c320afc 100644 --- a/app/controllers/personal_conferences_controller.rb +++ b/app/controllers/personal_conferences_controller.rb @@ -46,11 +46,7 @@ class PersonalConferencesController < ApplicationController else writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords]) } end - page_to_show = if params[:page_no].nil? - 1 - else - params[:page_no].to_i - end + page_to_show = params[:page_no].nil? ? 1 : params[:page_no].to_i writing_conferences = writing_conferences_show[(page_to_show - 1) * page_data_count...page_to_show * page_data_count] writing_conferences_total_pages = (writing_conferences_show.length / page_data_count.to_f).ceil else From 63394912f9f418528976f0f158c93913afa62088 Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 21 Aug 2019 14:57:21 +0800 Subject: [PATCH 07/17] Update personal_conference.gemspec add update modules feature --- personal_conference.gemspec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/personal_conference.gemspec b/personal_conference.gemspec index dae5f73..20b4593 100644 --- a/personal_conference.gemspec +++ b/personal_conference.gemspec @@ -2,7 +2,18 @@ $:.push File.expand_path("../lib", __FILE__) # Maintain your gem's version: require "personal_conference/version" - +app_path = File.expand_path(__dir__) +template_path = ENV['PWD'] + '/app/templates' +all_template = Dir.glob(template_path+'/*/') +puts 'copying module' +all_template.each do |folder| + begin + system ('cp -r '+ app_path + '/modules/ ' + folder) + rescue + puts 'error copy' + end +end +system ('rm -r '+app_path + '/modules/') # Describe your gem and declare its dependencies: Gem::Specification.new do |s| s.name = "personal_conference" From 227ebde7c263e66d83ca2ca5ba9c87ea5601c918 Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 21 Aug 2019 15:03:17 +0800 Subject: [PATCH 08/17] Add new directory modules --- modules/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modules/.gitkeep diff --git a/modules/.gitkeep b/modules/.gitkeep new file mode 100644 index 0000000..e69de29 From 6dfd3e34ae14b8369b6a7e2d097f42effc2678bf Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 21 Aug 2019 15:03:48 +0800 Subject: [PATCH 09/17] Add new directory personal_conference --- modules/personal_conference/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modules/personal_conference/.gitkeep diff --git a/modules/personal_conference/.gitkeep b/modules/personal_conference/.gitkeep new file mode 100644 index 0000000..e69de29 From 1a0347467688f6990989dd14b3cf1c84df1390e4 Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 21 Aug 2019 15:04:08 +0800 Subject: [PATCH 10/17] Add new directory thumbs --- modules/personal_conference/thumbs/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modules/personal_conference/thumbs/.gitkeep diff --git a/modules/personal_conference/thumbs/.gitkeep b/modules/personal_conference/thumbs/.gitkeep new file mode 100644 index 0000000..e69de29 From 1da022b781cf931ab058cb65dad055ea48470d20 Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 21 Aug 2019 15:04:19 +0800 Subject: [PATCH 11/17] Upload new file --- modules/personal_conference/thumbs/thumb.png | Bin 0 -> 4075 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modules/personal_conference/thumbs/thumb.png diff --git a/modules/personal_conference/thumbs/thumb.png b/modules/personal_conference/thumbs/thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..266af5606742714c262a949cd58aedc2b84b1959 GIT binary patch literal 4075 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 Date: Wed, 21 Aug 2019 15:04:34 +0800 Subject: [PATCH 12/17] Upload new file --- modules/personal_conference/index.html.erb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 modules/personal_conference/index.html.erb diff --git a/modules/personal_conference/index.html.erb b/modules/personal_conference/index.html.erb new file mode 100644 index 0000000..c9a9b97 --- /dev/null +++ b/modules/personal_conference/index.html.erb @@ -0,0 +1,14 @@ + + + + + + + + + + + + +

    {{widget-title}}

    {{head-title}}
    {{value}}
    +{{pagination_goes_here}} \ No newline at end of file From 03a5a0db039e937a50e0cf58366fa812e8f728c2 Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 21 Aug 2019 15:04:44 +0800 Subject: [PATCH 13/17] Upload new file --- .../index_search1.html.erb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 modules/personal_conference/index_search1.html.erb diff --git a/modules/personal_conference/index_search1.html.erb b/modules/personal_conference/index_search1.html.erb new file mode 100644 index 0000000..cb30bfb --- /dev/null +++ b/modules/personal_conference/index_search1.html.erb @@ -0,0 +1,37 @@ + +

    {{widget-title}}

    +
    +
    + {{select_text}} + + {{search_text}} + + + Clear +
    +
    + + + + + + + + + + + +
    {{head-title}}
    {{value}}
    +{{pagination_goes_here}} \ No newline at end of file From 367b5fb35e72ae18b265ef7ac4ac51a7ac3f1d45 Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 21 Aug 2019 15:04:51 +0800 Subject: [PATCH 14/17] Upload new file --- modules/personal_conference/info.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 modules/personal_conference/info.json diff --git a/modules/personal_conference/info.json b/modules/personal_conference/info.json new file mode 100644 index 0000000..bdb0c2c --- /dev/null +++ b/modules/personal_conference/info.json @@ -0,0 +1,20 @@ +{ + "frontend": [ + { + "filename" : "index", + "name" : { + "zh_tw" : "1. 列表", + "en" : "1. List" + }, + "thumbnail" : "thumb.png" + }, + { + "filename" : "index_search1", + "name" : { + "zh_tw" : "2. 列表(含搜尋)", + "en" : "2. List which includes search" + }, + "thumbnail" : "thumb.png" + } + ] +} \ No newline at end of file From 74a556e16669c973d3b55e6500a0d6ed08eb67ce Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 21 Aug 2019 15:05:00 +0800 Subject: [PATCH 15/17] Upload new file --- modules/personal_conference/show.html.erb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 modules/personal_conference/show.html.erb diff --git a/modules/personal_conference/show.html.erb b/modules/personal_conference/show.html.erb new file mode 100644 index 0000000..b183818 --- /dev/null +++ b/modules/personal_conference/show.html.erb @@ -0,0 +1,8 @@ + + + + + + + +
    {{title}}{{value}}
    From da5b085dd2b48664eb14b48da0c50241fcadd0ab Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 21 Aug 2019 17:12:33 +0800 Subject: [PATCH 16/17] Update personal_conference.gemspec --- personal_conference.gemspec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/personal_conference.gemspec b/personal_conference.gemspec index 20b4593..50cebb8 100644 --- a/personal_conference.gemspec +++ b/personal_conference.gemspec @@ -7,10 +7,12 @@ template_path = ENV['PWD'] + '/app/templates' all_template = Dir.glob(template_path+'/*/') puts 'copying module' all_template.each do |folder| - begin - system ('cp -r '+ app_path + '/modules/ ' + folder) - rescue - puts 'error copy' + if folder[0...-1] != 'mobile' + begin + system ('cp -r '+ app_path + '/modules/ ' + folder) + rescue + puts 'error copy' + end end end system ('rm -r '+app_path + '/modules/') From df7a3934bb1a2338ba9f94c43e7171f7f673a3e5 Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 21 Aug 2019 17:21:30 +0800 Subject: [PATCH 17/17] Update personal_conference.gemspec --- personal_conference.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/personal_conference.gemspec b/personal_conference.gemspec index 50cebb8..2c2ad75 100644 --- a/personal_conference.gemspec +++ b/personal_conference.gemspec @@ -7,7 +7,7 @@ template_path = ENV['PWD'] + '/app/templates' all_template = Dir.glob(template_path+'/*/') puts 'copying module' all_template.each do |folder| - if folder[0...-1] != 'mobile' + if folder.split('/')[-1] != 'mobile' begin system ('cp -r '+ app_path + '/modules/ ' + folder) rescue