From 9f6c9156c6859691572cf3f09d09f2a8c44e2799 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 24 Apr 2012 16:25:30 +0800 Subject: [PATCH] Spen patch for nccu --- .../bulletin_categorys/_bulletin_category.html.erb | 1 - .../back_end/bulletin_categorys/index.html.erb | 1 - .../panel/announcement/back_end/bulletins/_form.html.erb | 8 +++++--- .../page_content/back_end/page_contexts_controller.rb | 2 +- .../page_content/back_end/page_contexts/index.html.erb | 2 ++ .../panel/web_resource/back_end/web_links_controller.rb | 3 ++- .../panel/web_resource/back_end/web_links/index.html.erb | 2 ++ 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb index 7f1b5626..e9396cba 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb @@ -12,5 +12,4 @@ <% @site_valid_locales.each do |locale| %> <%= bulletin_category.i18n_variable[locale] rescue nil %> <% end %> - <%= bulletin_category.display %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb index 0a6e7f83..28d2fde0 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb @@ -8,7 +8,6 @@ <% @site_valid_locales.each do |locale| %> <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> <% end %> - <%= t('bulletin_category.display') %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb index a8fb3587..5cc03143 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb @@ -50,7 +50,7 @@
- <%= f.date_select :postdate, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'input-small'} %> + <%= f.date_select :postdate, {:use_month_numbers => true, :order => [:day, :month, :year] }, {:class => 'input-small'} %>
@@ -144,14 +144,16 @@ <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
- <% @site_valid_locales.each_with_index do |locale, i| %> + <%# @site_valid_locales.each_with_index do |locale, i| %> + <% site_valid_locales_default_head.each_with_index do |locale, i| %>
"> diff --git a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb index 10a33236..87f3447c 100644 --- a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb +++ b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb @@ -5,7 +5,7 @@ class Panel::PageContent::BackEnd::PageContextsController < OrbitBackendControll def index - @page_contexts = PageContext.where(:archived => false).desc(:updated_at) + @page_contexts = PageContext.where(:archived => false).desc(:updated_at).page(params[:page]).per(10) respond_to do |format| format.html # index.html.erb diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb index 3227dcd4..852697c7 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb @@ -17,4 +17,6 @@ +<%= paginate @page_contexts %> + diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb index e2b681b9..c3fe0fbc 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb @@ -7,7 +7,8 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController get_categorys(params[:web_link_category_id]) - @web_links = WebLink.search(params[:category_id]) + # @web_links = WebLink.search(params[:category_id]) + @web_links = WebLink.all.page(params[:page]).per(10) get_tags diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb index 301c1bbe..951fb4d9 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb @@ -19,3 +19,5 @@ +<%= paginate @web_links %> +