From f94e675ca0044e7cd28edea9362b685c066237ff Mon Sep 17 00:00:00 2001 From: thomaschen <99703040@nccu.edu.tw> Date: Sun, 25 Aug 2013 14:44:03 +0800 Subject: [PATCH] build dic front_end index and show --- .../front_end/dictionary_vocabs_controller.rb | 88 +++++++++++++++++++ .../dictionary_vocabs/index.html.erb | 30 +++++++ .../front_end/dictionary_vocabs/show.html.erb | 31 +++++++ .../dictionary/config/routes.rb | 3 +- 4 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/front_end/dictionary_vocabs_controller.rb create mode 100644 vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/show.html.erb diff --git a/vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/front_end/dictionary_vocabs_controller.rb b/vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/front_end/dictionary_vocabs_controller.rb new file mode 100644 index 000000000..7d302e0a0 --- /dev/null +++ b/vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/front_end/dictionary_vocabs_controller.rb @@ -0,0 +1,88 @@ +class Panel::Dictionary::FrontEnd::DictionaryVocabsController < OrbitWidgetController + include AdminHelper + + def initialize + super + @app_title = 'dictionary_vocabs' + end + + # def get_search_result + # @search = ArchiveFileCategory.solr_search do + # fulltext params[:search_query] + # with(:frontend_search,true) + # end + + # search_result = @search.results.collect{|result| result.id} + # params[:category_id] = @search.results.collect{|result| result.id} + + # @archive_file_categorys = ArchiveFileCategory.any_in(_id:search_result).page( params[:page_main]).per(@page_num) + # end + + def index + @vocabs = DictionaryVocab.all + # @item = Page.find(params[:page_id]) + # @title = @item.title + # if !@item.frontend_data_count.blank? + # @page_num = @item.frontend_data_count + # else + # @page_num = 10 + # end + + # date_now = Time.now + # @archive_file_categorys = ArchiveFileCategory.all + # # @archive_files = ArchiveFile.where( :is_hidden => false ).desc(:is_top).page(params[:page]).per(@page_num) + + # if !params[:category_id].blank? && !params[:tag_id].blank? + # @archive_files = @archive_files.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num) + + # @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil + + # elsif !params[:category_id].blank? + # @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num) + # @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil + # elsif !params[:tag_id].blank? + # @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num) + # else + # @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.desc( :is_top ).page( params[:page_main] ).per(@page_num) + # end + + # get_categorys + + # if params[:sort] + # @archive_files = get_sorted_and_filtered('archive_file', nil, @archive_files) + # end + end + + def show + @vocab = DictionaryVocab.find(params[:id]) + end + + # protected + + # def reload_archive_files + # @item = Page.find(params[:page_id]) + # @title = @item.title + # if @item.frontend_data_count + # @page_num = @item.frontend_data_count + # else + # @page_num = 0 + # end + # date_now = Time.now + # @archive_file_categorys = ArchiveFileCategory.all + # # @archive_files = ArchiveFile.where( :is_hidden => false ).desc(:is_top).page(params[:page]).per(@page_num) + + # if !params[:category_id].blank? + # @archive_files = ArchiveFile.can_display.where(:archive_file_category_id => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num) + # @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil + # elsif !params[:tag_id].blank? + # @archive_files = ArchiveFile.can_display.where(:tagged_ids => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num) + # else + # @archive_files = ArchiveFile.can_display.desc( :is_top ).page( params[:page_main] ).per(@page_num) + # end + # get_categorys + # end + + # def get_categorys + # @archive_file_categorys = ArchiveFileCategory.excludes('disabled' => true) + # end +end diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb index e69de29bb..7ea2ba593 100644 --- a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb +++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb @@ -0,0 +1,30 @@ +
+
+ + + + + + + + + + + + <% @vocabs.each do |vocab| %> + + + + + + <% end %> + + +
<%= t :category, :scope => :dictionary %><%= t :word, :scope => :dictionary %><%= t :time, :scope => :dictionary %>
<%= vocab.dictionary_vocab_category.title %><%= link_to truncate(vocab.word,length: 25), panel_dictionary_front_end_dictionary_vocab_path(vocab) %><% if vocab.created_at > Time.now.beginning_of_day %> + <%="#{time_ago_in_words(vocab.created_at)}"%> + <%=t :ago,:scope => :dictionary%> + <% else %> + <%= vocab.created_at.strftime("%Y/%m/%d") %> + <% end %>
+
+
\ No newline at end of file diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/show.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/show.html.erb new file mode 100644 index 000000000..29a5fe2c3 --- /dev/null +++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/show.html.erb @@ -0,0 +1,31 @@ +
+
+ + + + + + + + + + + + + + + + + + + + + +
<%= t :category, :scope => :dictionary %><%= @vocab.dictionary_vocab_category.key %>
<%= t :word, :scope => :dictionary %><%= @vocab.word %>
<%= t :definition, :scope => :dictionary %>
<%= @vocab.definition %>
<%= t :time, :scope => :dictionary %><% if @vocab.created_at > Time.now.beginning_of_day %> + <%="#{time_ago_in_words(@vocab.created_at)}"%> + <%=t :ago,:scope => :dictionary%> + <% else %> + <%= @vocab.created_at.strftime("%Y/%m/%d") %> + <% end %>
<%= link_to t(:back), panel_dictionary_front_end_dictionary_vocabs_path%>
+
+
\ No newline at end of file diff --git a/vendor/built_in_modules/dictionary/config/routes.rb b/vendor/built_in_modules/dictionary/config/routes.rb index e931206b2..ca71e6de7 100644 --- a/vendor/built_in_modules/dictionary/config/routes.rb +++ b/vendor/built_in_modules/dictionary/config/routes.rb @@ -12,8 +12,7 @@ Rails.application.routes.draw do end namespace :front_end do - get "dictionary_vocabs" => "dictionary_vocabs#index" - # resources :archive_files + resources :dictionary_vocabs end namespace :widget do