From ebf3a2eae451ec7e38fcfd1e21533322f90999f3 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 1 Mar 2012 10:57:13 +0800 Subject: [PATCH 001/125] Fix extra loaded js: the widgets only need to render layout when they need js. --- app/controllers/obit_frontend_component_controller.rb | 2 +- .../panel/announcement/widget/bulletins_controller.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/obit_frontend_component_controller.rb b/app/controllers/obit_frontend_component_controller.rb index d0be3a25..2c44b60c 100644 --- a/app/controllers/obit_frontend_component_controller.rb +++ b/app/controllers/obit_frontend_component_controller.rb @@ -1,7 +1,7 @@ class ObitFrontendComponentController< ApplicationController before_filter :setup_vars before_filter {|c| c.front_end_available(@app_title)} - layout 'module_widget' + layout :false def setup_vars @app_title = request.fullpath.split('/')[2] diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index 6695156a..333f88e7 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -28,6 +28,7 @@ class Panel::Announcement::Widget::BulletinsController < ObitWidgetController @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0] @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil + render :layout => 'module_widget' end def reload_bulletins From 9ae140204f62bae987fddd1fb3eb393e1880bd89 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 1 Mar 2012 10:58:31 +0800 Subject: [PATCH 002/125] Fix announcement pagination in front-end --- app/controllers/pages_controller.rb | 6 +++++- lib/parsers/parser_back_end.rb | 2 +- lib/parsers/parser_front_end.rb | 2 +- .../panel/announcement/front_end/bulletins_controller.rb | 6 +++--- .../panel/announcement/front_end/bulletins/index.html.erb | 4 ++-- vendor/built_in_modules/announcement/config/routes.rb | 1 - 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index aa66238d..8ea35391 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -30,7 +30,11 @@ class PagesController < ApplicationController end def index_from_link - redirect_to "/#{@item.full_name}" + if params[:page] + redirect_to "/#{@item.full_name}?page=#{params[:page]}" + else + redirect_to "/#{@item.full_name}" + end end def show_from_link diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb index dea65b6a..37c22ed1 100644 --- a/lib/parsers/parser_back_end.rb +++ b/lib/parsers/parser_back_end.rb @@ -100,7 +100,7 @@ module ParserBackEnd ret = '' if (tag.attributes["main"] == "true" && !page.module_app.nil?) ret << "
" else part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 305596ed..17468e54 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -127,7 +127,7 @@ module ParserFrontEnd ret << "
" else part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb index b71a4609..e840d65f 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb @@ -11,15 +11,15 @@ class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController def index date_now = Time.now - if params[:bulletin_category_id] - @bulletins = Bulletin.where(:bulletin_category_id => params[:bulletin_category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) + if params[:category_id] + @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) else @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) end get_categorys - @current_category = BulletinCategory.from_id(params[:bulletin_category_id]) rescue nil + @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil end def show diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb index d4335e9a..086794b9 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb @@ -28,6 +28,6 @@ <% end %> - -<%= paginate @bulletins %> + +<%= paginate @bulletins, :params => {:inner => 'false'} %> diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index c3a60f74..a604da85 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -10,7 +10,6 @@ Rails.application.routes.draw do resources :tags end namespace :front_end do - root :to => "bulletins#index" resources :bulletins end namespace :widget do From 826a5a5f20f158237dc49b36e3692183111f31d5 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 1 Mar 2012 14:12:47 +0800 Subject: [PATCH 003/125] Fix link in widget --- .../panel/announcement/widget/bulletins/_web_links.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb index 3a6982dc..2b65417d 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb @@ -1,6 +1,6 @@ <% @web_links.each do |web_link| %>
  • - <%= web_link.name[I18n.locale] %> + <%= link_to web_link.name[I18n.locale], web_link.url %>
    • <% end %> From 900855724c4e06984b3291fe4bdae46399f94b24 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 7 Mar 2012 11:37:00 +0800 Subject: [PATCH 004/125] Add bootstrap-orbit.css in front-end --- lib/parsers/parser_front_end.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 17468e54..99353cc1 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -62,6 +62,7 @@ module ParserFrontEnd c.define_tag 'stylesheets' do |tag| res = '' res << "" + res << "" res << "" res << "" if page.design.reset_css res << " " if page.design.default_css From 0b1f83c042edae823005eb22f0cf9e677d78d01a Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 1 Mar 2012 10:57:13 +0800 Subject: [PATCH 005/125] Fix extra loaded js: the widgets only need to render layout when they need js. --- app/controllers/orbit_frontend_component_controller.rb | 2 +- .../panel/announcement/widget/bulletins_controller.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/orbit_frontend_component_controller.rb b/app/controllers/orbit_frontend_component_controller.rb index 12695040..185dbce6 100644 --- a/app/controllers/orbit_frontend_component_controller.rb +++ b/app/controllers/orbit_frontend_component_controller.rb @@ -1,7 +1,7 @@ class OrbitFrontendComponentController< ApplicationController before_filter :setup_vars before_filter {|c| c.front_end_available(@app_title)} - layout 'module_widget' + layout :false def setup_vars @app_title = request.fullpath.split('/')[2] diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index 6695156a..333f88e7 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -28,6 +28,7 @@ class Panel::Announcement::Widget::BulletinsController < ObitWidgetController @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0] @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil + render :layout => 'module_widget' end def reload_bulletins From 4dd9b7ffa43b873db2cdba66163dceb0b24f14f4 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 1 Mar 2012 10:58:31 +0800 Subject: [PATCH 006/125] Fix announcement pagination in front-end --- app/controllers/pages_controller.rb | 6 +++++- lib/parsers/parser_back_end.rb | 2 +- lib/parsers/parser_front_end.rb | 2 +- .../panel/announcement/front_end/bulletins_controller.rb | 6 +++--- .../panel/announcement/front_end/bulletins/index.html.erb | 4 ++-- vendor/built_in_modules/announcement/config/routes.rb | 1 - 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index aa66238d..8ea35391 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -30,7 +30,11 @@ class PagesController < ApplicationController end def index_from_link - redirect_to "/#{@item.full_name}" + if params[:page] + redirect_to "/#{@item.full_name}?page=#{params[:page]}" + else + redirect_to "/#{@item.full_name}" + end end def show_from_link diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb index dea65b6a..37c22ed1 100644 --- a/lib/parsers/parser_back_end.rb +++ b/lib/parsers/parser_back_end.rb @@ -100,7 +100,7 @@ module ParserBackEnd ret = '' if (tag.attributes["main"] == "true" && !page.module_app.nil?) ret << "
    " else part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 305596ed..17468e54 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -127,7 +127,7 @@ module ParserFrontEnd ret << "
    " else part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb index b71a4609..e840d65f 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb @@ -11,15 +11,15 @@ class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController def index date_now = Time.now - if params[:bulletin_category_id] - @bulletins = Bulletin.where(:bulletin_category_id => params[:bulletin_category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) + if params[:category_id] + @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) else @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) end get_categorys - @current_category = BulletinCategory.from_id(params[:bulletin_category_id]) rescue nil + @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil end def show diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb index d4335e9a..086794b9 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb @@ -28,6 +28,6 @@ <% end %> - -<%= paginate @bulletins %> + +<%= paginate @bulletins, :params => {:inner => 'false'} %> diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index 78425f33..cb39d253 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -13,7 +13,6 @@ Rails.application.routes.draw do resources :tags end namespace :front_end do - root :to => "bulletins#index" resources :bulletins end namespace :widget do From 79c8b3861b3e92aef8493da22858aa7b340429e9 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 1 Mar 2012 14:12:47 +0800 Subject: [PATCH 007/125] Fix link in widget --- .../panel/announcement/widget/bulletins/_web_links.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb index 3a6982dc..2b65417d 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_web_links.html.erb @@ -1,6 +1,6 @@ <% @web_links.each do |web_link| %>
  • - <%= web_link.name[I18n.locale] %> + <%= link_to web_link.name[I18n.locale], web_link.url %>
    • <% end %> From 3e22c6e61b79bf379deca7fff08190ee083cdf54 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 7 Mar 2012 11:37:00 +0800 Subject: [PATCH 008/125] Add bootstrap-orbit.css in front-end --- lib/parsers/parser_front_end.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 17468e54..99353cc1 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -62,6 +62,7 @@ module ParserFrontEnd c.define_tag 'stylesheets' do |tag| res = '' res << "" + res << "" res << "" res << "" if page.design.reset_css res << " " if page.design.default_css From 00ab7739426678983bc6cc529e7cf12cbc18a0f1 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Mar 2012 20:05:03 +0800 Subject: [PATCH 009/125] fix dashboard & announcement --- app/assets/javascripts/bulletin_form.js.erb | 3 +- app/views/layouts/_side_bar.html.erb | 15 +- .../back_end/bulletins_controller.rb | 51 +- .../announcement/app/models/bulletin.rb | 26 +- .../announcement/app/models/bulletin_file.rb | 22 +- .../announcement/app/models/bulletin_link.rb | 8 +- .../_bulletin_category.html.erb | 28 +- .../bulletin_categorys/_form.html.erb | 54 +- .../bulletin_categorys/_quick_edit.html.erb | 13 + .../_quick_edit_qe.html.erb | 28 + .../bulletin_categorys/index.html.erb | 46 +- .../bulletins/_bulletin_file.html.erb | 16 +- .../bulletins/_bulletin_link.html - 複製.erb | 27 + .../bulletins/_bulletin_link.html.erb | 10 +- .../bulletins/_bulletin_link2.html - 複製.erb | 16 + .../bulletins/_bulletin_link2.html.erb | 17 + .../bulletins/_bulletin_link_qe.html.erb | 41 + .../back_end/bulletins/_form.html.erb | 720 ++++++------------ .../bulletins/_quick_edit_links.html.erb | 34 +- .../bulletins/_quick_edit_picture.html.erb | 13 +- .../back_end/bulletins/index.html - 複製.erb | 9 + .../back_end/bulletins/link_quick_edit.js.erb | 2 + .../back_end/bulletins/show.html.erb | 10 +- .../widget/bulletins/index.html.erb | 2 +- .../announcement/config/routes.rb | 5 +- .../back_end/page_contexts/_form.html.erb | 51 +- .../page_contexts/_page_context.html.erb | 22 +- .../page_contexts/_view_page_context.html.erb | 23 +- .../back_end/page_contexts/edit.html.erb | 10 +- .../back_end/page_contexts/index.html.erb | 42 +- .../back_end/page_contexts/view.html.erb | 41 +- .../back_end/web_link_categorys_controller.rb | 2 +- .../back_end/web_links_controller.rb | 2 +- .../web_link_categorys/_form.html.erb | 38 +- .../_web_link_category.html.erb | 26 +- .../web_link_categorys/index.html.erb | 46 +- .../back_end/web_links/_form.html.erb | 145 ++-- .../back_end/web_links/_web_links.html.erb | 17 +- .../back_end/web_links/index.html.erb | 59 +- 39 files changed, 845 insertions(+), 895 deletions(-) create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb index 5002cfae..17f86060 100644 --- a/app/assets/javascripts/bulletin_form.js.erb +++ b/app/assets/javascripts/bulletin_form.js.erb @@ -1,4 +1,4 @@ -$('.bulletin_urls_block a.delete').live('click', function(){ +$('.bulletin_links_block a.delete').live('click', function(){ $(this).parents('.list_item').remove(); }); @@ -9,4 +9,5 @@ $('.bulletin_files_block a.delete').live('click', function(){ $('.action a.remove_existing_record').live('click', function(){ $(this).next('.should_destroy').attr('value', 1); $("#bulletin_" + $(this).prev().attr('value')).hide(); + $("tr#bulletin_" + $(this).prev().attr('value')).hide(); }); \ No newline at end of file diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 15948578..61e2c4d8 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -16,16 +16,25 @@ <%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), panel_web_resource_back_end_web_links_path %> <% end -%> -<%= content_tag :li, :class => active_for_controllers(nil) do -%> +<%= content_tag :li, :class => active_for_controllers('page_contexts') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-page') + t('admin.page'), panel_page_content_back_end_page_contexts_path %> + <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%> + <%= content_tag :li, link_to(t('admin.all_articles'), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %> + <% end -%> <% end -%> <%= content_tag :li, :class => active_for_controllers('designs') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %> <% end -%> -<%= content_tag :li, :class => active_for_controllers(nil) do -%> - <%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), nil %> +<%= content_tag :li, :class => active_for_controllers('web_links', 'tags', 'web_link_categorys') do -%> + <%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %> + <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', 'tags', 'web_link_categorys')) do -%> + <%= content_tag :li, link_to(t('admin.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_link', 'index') %> + <%= content_tag :li, link_to(t('admin.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %> + <%= content_tag :li, link_to(t('admin.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %> + <%= content_tag :li, link_to(t('admin.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('tags', 'index') %> + <% end -%> <% end -%> <%= content_tag :li, :class => active_for_controllers(nil) do -%> diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 48b9ac88..09e94c2d 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -9,6 +9,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController # @bulletins = Bulletin.all # @bulletins = Bulletin.desc("postdate desc") get_categorys(params[:bulletin_category_id]) + get_tags # @bulletins = Bulletin.where("bulletin_category_id" => params[:bulletin_category_id]).desc("postdate") if params[:bulletin_category_id] @@ -16,9 +17,6 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]]) @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all @bulletin_categories = BulletinCategory.all - - module_app = ModuleApp.first(:conditions => {:key => 'announcement'}) - @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc) respond_to do |format| format.html # index.html.erb @@ -31,6 +29,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController # GET /bulletins/1.xml def show @bulletin = Bulletin.find(params[:id]) + get_tags # get_categorys # @bulletin_categorys = BulletinCategory.where("_id" => params[:id]) @@ -51,11 +50,14 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController # GET /bulletins/new.xml def new @bulletin = Bulletin.new + + @link_url = panel_announcement_back_end_bulletins_path # @bulletin.bulletin_files.build # @bulletin.bulletin_files.new get_categorys + get_tags respond_to do |format| format.html # new.html.erb @@ -67,7 +69,11 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController def edit @bulletin = Bulletin.find(params[:id]) # @summary_variable = @bulletin.summary_variable + + @link_url = panel_announcement_back_end_bulletin_path(@bulletin) + get_categorys + get_tags end # POST /bulletins @@ -90,6 +96,32 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController end end + def link_quick_add + # debugger + + @bulletin = Bulletin.find(params[:bulletin_id]) + + @link_url = panel_announcement_back_end_bulletins_path + + respond_to do |format| + format.js + end + + end + + def link_quick_edit + # debugger + + @bulletin = Bulletin.find(params[:bulletin_id]) + + @link_url = panel_announcement_back_end_bulletin_path(@bulletin) + + respond_to do |format| + format.js + end + + end + # PUT /bulletins/1 # PUT /bulletins/1.xml def update @@ -98,11 +130,11 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController @bulletin.update_user_id = current_user.id # @bulletin.image.clear if params[:bulletin][:image_del] == '1' - if params[:bulletin][:image_del] == '1' - @bulletin.remove_image! + # if params[:bulletin][:image_del] == '1' + # @bulletin.remove_image! # @bulletin.image_del = nil - params[:bulletin][:image_del] = nil - end + # params[:bulletin][:image_del] = nil + # end respond_to do |format| if @bulletin.update_attributes(params[:bulletin]) @@ -147,6 +179,11 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController def get_categorys(id = nil) @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true)) end + + def get_tags + module_app = ModuleApp.first(:conditions => {:key => 'announcement'}) + @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc) + end def get_sorted_bulletins bulletins = Bulletin.all diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index 7c258f23..a1141b41 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -26,10 +26,11 @@ class Bulletin belongs_to :bulletin_category - embeds_many :bulletin_links, :cascade_callbacks => true - embeds_many :bulletin_files, :cascade_callbacks => true + # embeds_many :bulletin_links, :cascade_callbacks => true + # embeds_many :bulletin_files, :cascade_callbacks => true - # has_many :bulletin_files, :autosave => true, :dependent => :destroy + has_many :bulletin_links, :autosave => true, :dependent => :destroy + has_many :bulletin_files, :autosave => true, :dependent => :destroy accepts_nested_attributes_for :bulletin_files, :allow_destroy => true accepts_nested_attributes_for :bulletin_links, :allow_destroy => true @@ -38,6 +39,9 @@ class Bulletin before_save :set_key + after_save :save_bulletin_links + after_save :save_bulletin_files + def self.search( search = nil, category_id = nil ) @@ -94,6 +98,22 @@ class Bulletin self.is_hidden end + def save_bulletin_links + self.bulletin_links.each do |t| + if t.should_destroy + t.destroy + end + end + end + + def save_bulletin_files + self.bulletin_files.each do |t| + if t.should_destroy + t.destroy + end + end + end + def title @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb index 28062d40..05894515 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb @@ -5,13 +5,27 @@ class BulletinFile mount_uploader :file, AssetUploader - field :filetitle - field :description + # field :filetitle + # field :description + has_one :filetitle, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + has_one :description, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy # field :to_save, :type => Boolean field :should_destroy, :type => Boolean - # belongs_to :bulletin - embedded_in :bulletin + belongs_to :bulletin + # embedded_in :bulletin + + + protected + + def set_key + if filetitle.new_record? + filetitle.key = 'filetitle' + end + if description.new_record? + description.key = 'description' + end + end end diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb index a999d45d..30363182 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb @@ -4,10 +4,12 @@ class BulletinLink include Mongoid::Timestamps field :url - field :name + # field :name + + has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy field :should_destroy, :type => Boolean - embedded_in :bulletin - + # embedded_in :bulletin + belongs_to :bulletin end 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 57998770..546356fe 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 @@ -1,13 +1,17 @@ - - <%= bulletin_category.key %> - <% @site_valid_locales.each do |locale| %> - <%= bulletin_category.i18n_variable[locale] rescue nil %> - <% end %> - <%= bulletin_category.display %> - - <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %> | - <%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %> | - <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %> - - \ No newline at end of file + + + <%= bulletin_category.key %> +
    +
      +
    • <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %>
      • +
    • <%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %>
      • +
    • <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
      • +
    +
    + + <% @site_valid_locales.each do |locale| %> + <%= bulletin_category.i18n_variable[locale] rescue nil %> + <% end %> + <%= bulletin_category.display %> + \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb index d7bfac7b..1ce7f629 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb @@ -1,36 +1,36 @@ <% # encoding: utf-8 %> <%= form_for(@bulletin_category, :remote => true, :url => @url) do |f| %> -<%#= form_for(@bulletin_category, :remote => true, :url => panel_announcement_back_end_bulletin_category_path(@bulletin_category)) do |f| %> -
    - <%= f.label :key %>
    - <%= f.text_field :key %> -
    - -
    - <%= f.label :name %>
    - <%= f.fields_for :i18n_variable, (@bulletin_category.new_record? ? @bulletin_category.build_i18n_variable : @bulletin_category.i18n_variable) do |f| %> - <% @site_valid_locales.each do |locale| %> - <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> - <%= f.text_field locale, :style => "width:130px" %> - <% end %> - <% end %> -
    - -
    - <%= f.label :display %>
    - <%#= f.select :display, BulletinCategory::PAYMENT_TYPES, :prompt => 'Select a display method' %> +

    <%= (@bulletin_category.new_record? ? 'Add' : 'Edit') %>

    - <%= f.radio_button :display, "List" %>List - <%#= f.label :display, 'list', :value => '1', :checked => @a %> - <%= f.radio_button :display, "Picture" %>Picture - <%#= f.label :display, 'picture', :value => '2', :checked => @b %> -
    憿舐內孵航身摰典圈Ｘ嚗鞈閮曄璅撘 -
    +
    + <%= f.label :key %> + <%= f.text_field :key %> +
    + +
    + <%= f.fields_for :i18n_variable, (@bulletin_category.new_record? ? @bulletin_category.build_i18n_variable : @bulletin_category.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> +
    + <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> +
    + <%= f.text_field locale, :class => 'input-xxlarge' %> +
    +
    + <% end %> + <% end %> +
    + +
    + <%= f.label :display %> + <%= f.radio_button :display, "List" %>List + <%= f.radio_button :display, "Picture" %>Picture +
    憿舐內孵航身摰典圈Ｘ嚗鞈閮曄璅撘 +
    -
    - <%= f.submit %> +
    + <%= f.submit 'Submit/', :class=>'btn btn-primary' %>
    <% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb new file mode 100644 index 00000000..14a72951 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb @@ -0,0 +1,13 @@ + + + + <%= t(:quick_edit) %> + <%= form_for bulletin_category, :url => panel_announcement_back_end_bulletin_category_path(bulletin_category), :html => {:class => 'form-horizontal'} do |f| %> + <%= render :partial => "quick_edit_qe", :locals => { :f => f, :bulletin_category => bulletin_category } %> +
    + <%= f.submit t(:submit), :class => 'btn btn-primary' %> + <%= f.submit t(:cancel), :class => 'btn', :type => 'reset' %> +
    + <% end %> + + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb new file mode 100644 index 00000000..cb32d861 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb @@ -0,0 +1,28 @@ +<% # encoding: utf-8 %> + +
    + +
    + <%= f.label :key %> + <%= f.text_field :key %> +
    +
    + <%= f.fields_for :i18n_variable, bulletin_category.i18n_variable do |f| %> + <% @site_valid_locales.each do |locale| %> +
    + <%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> +
    + <%= f.text_field locale, :class => 'input-xxlarge' %> +
    +
    + <% end %> + <% end %> +
    + +
    + <%= f.label :display %> + <%= f.radio_button :display, "List" %>List + <%= f.radio_button :display, "Picture" %>Picture +
    憿舐內孵航身摰典圈Ｘ嚗鞈閮曄璅撘 +
    +
    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 87a2993c..0a6e7f83 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 @@ -1,43 +1,23 @@ -<% content_for :secondary do %> -
    -
    -
    -
    -
    -
      -
    • <%#= link_to t('bulletin_category.new_announcement_class'), new_panel_announcement_back_end_bulletin_category_path, :class => 'seclink1' %>
      • -
    -<% end -%> <%= flash_messages %> -

    <%= t('bulletin_category.list_announcement_class') %>

    -
    -
    -
    -
    -
    - - - - <% @site_valid_locales.each do |locale| %> - - <% end %> - - - +
    <%= t('bulletin_category.key') %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %><%= t('bulletin_category.display') %><%= t('bulletin.action') %>
    + + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + + + -<%# @bulletin_categorys.each do |post| %> <%= render :partial => 'bulletin_category', :collection => @bulletin_categorys %> -<%# end %> + +
    <%= t('bulletin_category.key') %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %><%= t('bulletin_category.display') %>
    -
    -
    -
    -
    - -

    Add New

    <%= render :partial => "form" %>
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb index 86785ee0..6da49ceb 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb @@ -6,10 +6,22 @@ <%= f.file_field :file %> <%= f.label :file_title %> - <%= f.text_field :filetitle %> + <%#= f.text_field :filetitle %> + <%= f.fields_for :filetitle, (bulletin_file.new_record? ? bulletin_file.build_filetitle : bulletin_file.filetitle ) do |f| %> + <% @site_valid_locales.each do |locale| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_field locale %> + <% end %> + <% end %> <%= f.label :file_description %> - <%= f.text_field :description %> + <%#= f.text_field :description %> + <%= f.fields_for :description, (bulletin_file.new_record? ? bulletin_file.build_description : bulletin_file.description ) do |f| %> + <% @site_valid_locales.each do |locale| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_field locale %> + <% end %> + <% end %> <% if bulletin_file.new_record? %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb new file mode 100644 index 00000000..33d1ba1e --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb @@ -0,0 +1,27 @@ + +
    " class='list_item'> +
    + + <%= f.label :link_url %> + <%= f.text_field :url %> + + <%= f.label :link_name %> + <%#= f.text_field :name %> + <%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> + <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> + <%= f.text_field locale, :style => "width:130px" %> + <% end %> + <% end %> + + + <% if bulletin_link.new_record? %> + <%= t(:delete) %> + <% else %> + <%= f.hidden_field :id %> + <%= t(:delete) %> + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> + <% end %> + +
    +
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb index 44c7ab75..e0077384 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb @@ -1,12 +1,18 @@ -
    " class='list_item'> +
    " class='list_item'>
    <%= f.label :link_url %> <%= f.text_field :url %> <%= f.label :link_name %> - <%= f.text_field :name %> + <%#= f.text_field :name %> + <%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> + <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> + <%= f.text_field locale, :style => "width:130px" %> + <% end %> + <% end %> <% if bulletin_link.new_record? %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb new file mode 100644 index 00000000..c44b5c92 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb @@ -0,0 +1,16 @@ + + "> + <%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %> + <%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %> + + + <%= f.hidden_field :id %> + + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> + + + + + + + \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb new file mode 100644 index 00000000..a3bc5243 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb @@ -0,0 +1,17 @@ + + "> + <%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %> + <%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %> + + + + <%= f.hidden_field :id %> + + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> + + + + + + + \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb new file mode 100644 index 00000000..7208f73c --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb @@ -0,0 +1,41 @@ +<% # encoding: utf-8 %> + + <%= form_for(@bulletin.bulletin_links, :remote => true, :url => @link_url) do |f| %> + + + + <% end %> + + + \ No newline at end of file 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 751a5f12..2e41f302 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 @@ -1,118 +1,246 @@ <% # encoding: utf-8 %> <%= f.error_messages %> - <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %> + + + +
    + +
    +
    + +
    +

    Picture

    +
    +
    + +
    + + +
    + +
    + <% if @bulletin.image.file %> + <%= f.check_box :remove_image %> + <%= t('announcement.芷文歇銝單獢') %> + <% end %> +
    +
    +
    +
    -
    - <%= f.label :image, t('announcement.image') %>
    - <%= f.file_field :image %> - <% if @bulletin.image.file %> - <%= check_box_tag 'bulletin[image_del]' %> - <%= t('announcement.芷文歇銝單獢') %> - <% end %> -
    +
    +
    + +
    +

    Date

    +
    +
    + +
    + <%= 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 :deadline, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'input-small'} %> +
    +
    +
    +
    + +
    +
    + +
    +

    Status

    +
    +
    + <%= f.check_box :is_top %><%= t('top') %> + <%= f.check_box :is_hot %><%= t('hot') %> + <%= f.check_box :is_hidden %><%= t('hide') %> +
    +
    +
    -
    - <%= f.label :title %> - <%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale %> - - <% end %> - <% end %> +
    +
    + +
    +

    Tags

    +
    + <% @tags.each do |tag| %> + <%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%> + <%= tag[I18n.locale] %> + <% end %> +
    +
    +
    -
    - <%= f.label :subtitle %> - <%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :rows => 10, :cols => 40 %> - - <% end %> - <% end %> -
    + + + -
    - <%= f.label :text %> - <%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :rows => 10, :cols => 40 %> - - <% end %> - <% end %> -
    - -
    - <%= f.label :postdate %>
    - <%= f.date_select :postdate, :order => [:year, :month, :day], :use_month_numbers => true %> - <%#= date_select("bulletin", "postdate", :use_month_numbers => true) %> -
    - -
    - <%= f.label :deadline %>
    - <%= f.date_select :deadline, :use_month_numbers => true, :prompt => { :day => 'Select day', :month => 'Select month', :year => 'Select year'} %> - <%#= f.date_select :deadline, :order => [:year, :month, :day],:default => 1.years.from_now, :use_month_numbers => true %> -
    - -
    - <%#= f.label :url %>
    - <%#= f.text_field :url, :size => 60 %> -
    - - - -
    --> - - - - - - diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb index adfe015c..1d9004c8 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb @@ -17,11 +17,13 @@ + <% bulletin.bulletin_links.each_with_index do |blink, i| %> - - + <%= link_to blink.i18n_variable.zh_tw, blink.url, :target => '_blank' %> + <%= link_to blink.i18n_variable.en, blink.url, :target => '_blank' %> + <% end %>
    @@ -32,27 +34,25 @@
    - +
    Please correct the error
    -
    - -
    - - Please correct the error -
    -
    -
    - -
    - - Please correct the error -
    -
    + + <% @site_valid_locales.each do |locale| %> +
    + +
    + + Please correct the error +
    +
    + <% end %> +
    +
    Submit/蝣箏 Cancel/瘨 diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb index 6e7c656a..ff59280f 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb @@ -5,13 +5,18 @@
    - +
    +
    + <% if bulletin.image.file %> + <%= f.check_box :remove_image %> + <%= t('announcement.芷文歇銝單獢') %> + <% end %>
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb new file mode 100644 index 00000000..d37d2134 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb @@ -0,0 +1,9 @@ +<%= render 'filter' %> + + <%= render 'bulletins' %> +
    + +
    + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %> +
    + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb new file mode 100644 index 00000000..cbe5e3c7 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb @@ -0,0 +1,2 @@ +//$.each($(".quick_edit"),function(obj){ $(this).remove(); }); +$("#<%= "bulletin_#{bulletin_link2.id}" %>").append("<%= j render "bulletin_link_qe" %>"); diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb index f02d9156..ace4ec12 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb @@ -17,7 +17,7 @@
  • <%= t('announcement.title') %> - <%= @bulletin.title %> + <%= @bulletin.title[I18n.locale] %>
  • <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %> @@ -25,23 +25,23 @@
  • <%= t('announcement.subtitle') %> - <%= @bulletin.subtitle %> + <%= @bulletin.subtitle[I18n.locale].html_safe %>
  • <%= t('announcement.text') %> - <%= @bulletin.text %> + <%= @bulletin.text[I18n.locale].html_safe %>
  • <%= t('announcement.link') %> <% @bulletin.bulletin_links.each do | blink | %> - <%= link_to blink.name, blink.url, :target => '_blank' %> + <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %> <% end %>
  • <%= t('announcement.file') %> <% @bulletin.bulletin_files.each do | bfile | %> - <%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %> + <%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description[I18n.locale]} if bfile.file.file %> <% end %>
  • diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb index e3ba9d48..33166165 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb @@ -11,7 +11,7 @@
  • <%= image_tag(post.image.url, :size => "290x130") if post.image.file %>

    <%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %>

    -

    <%= post.subtitle[I18n.locale] %>

    +

    <%= post.subtitle[I18n.locale].html_safe %>

    • <% end %> diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index c3a60f74..9a405ecc 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -3,7 +3,10 @@ Rails.application.routes.draw do namespace :announcement do namespace :back_end do root :to => "bulletins#index" - resources :bulletins + resources :bulletins do + match "link_quick_add/:bulletin_id" => "bulletins#link_quick_add" ,:as => :link_quick_add + match "link_quick_edit/:bulletin_id" => "bulletins#link_quick_edit" ,:as => :link_quick_edit + end resources :bulletin_categorys, :controller => 'bulletin_categorys' do match "quick_edit/:bulletin_category_id" => "bulletin_categorys#quick_edit" ,:as => :quick_edit end diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb index e5c7fc45..4ca568a9 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb @@ -1,31 +1,32 @@ <% # encoding: utf-8 %> - <%= f.error_messages %> - <%#= debugger %> - -
    - <%= f.label :name %> - <%= @page_context.page.i18n_variable[I18n.locale] %> -
    +<%= f.error_messages %> -
    - <%= f.label :context %> - <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :rows => 10, :cols => 40 %> - - <% end %> - <% end %> -
    - -
    -
    - -
    - <%= f.submit %> -
    +
    + +
    + <%= f.label :name %> + <%= @page_context.page.i18n_variable[I18n.locale] %> +
    + +
    + <%= f.label :context %> + <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> + <% @site_valid_locales.each do |locale| %> + + <%= I18nVariable.from_locale(locale) %> + <%= f.text_area locale, :style=>"width:100%" %> + + <% end %> + <% end %> +
    + + +
    + <%= f.submit 'Submit/', :class=>'btn btn-primary' %> +
    + +
    <% content_for :page_specific_javascript do %> diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb index c1d86fe1..08db9b2d 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb @@ -1,10 +1,14 @@ - - <%= page_context.page.i18n_variable[I18n.locale] %> - <%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %> - <%= page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %> - <%= User.find(page_context.create_user_id).name %> - - <%= link_to t('page_context.edit'), edit_panel_page_content_back_end_page_context_path(page_context) %> - - + + + <%= page_context.page.i18n_variable[I18n.locale] %> +
    +
      +
    • <%= link_to t('page_context.edit'), edit_panel_page_content_back_end_page_context_path(page_context) %>
      • +
    +
    + + <%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %> + <%= page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %> + <%= User.find(page_context.create_user_id).name %> + \ No newline at end of file diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb index db23a280..7035a700 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb @@ -1,10 +1,15 @@ - - <%= view_page_context.page.i18n_variable[I18n.locale] %> - <%= view_page_context.version %> - <%= view_page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %> - <%= User.find(view_page_context.create_user_id).name %> - - <%= link_to t('view_page_context.show'), panel_page_content_back_end_page_context_path(view_page_context) %> - - + + + + <%= view_page_context.page.i18n_variable[I18n.locale] %> +
    +
      +
    • <%= link_to t('view_page_context.show'), panel_page_content_back_end_page_context_path(view_page_context) %>
      • +
    +
    + + <%= view_page_context.version %> + <%= view_page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %> + <%= User.find(view_page_context.create_user_id).name %> + \ No newline at end of file diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb index 18bb0ce5..86f2398c 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb @@ -1,7 +1,3 @@ -
    -
    -
    -

    <%= t('page_content.editing_page_content') %>

    @@ -9,8 +5,4 @@ <%= render :partial => 'form', :locals => {:f => f} %> <% end %> -<%= link_back %> -
    -
    -
    -
    \ No newline at end of file +<%#= link_back %> \ No newline at end of file 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 a1566881..3227dcd4 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 @@ -1,36 +1,20 @@ -<% content_for :secondary do %> -
    -
    -
    -
    -
    -
      -
    • <%= link_to t('page_context.page_content_list'), panel_page_content_back_end_page_contexts_path %>
      • -
    -<% end -%> <%= flash_messages %> -
    -
    -
    -
    -
    - -

    <%= t('page_context.list_page_content') %>

    - - - - - - - - - +
    <%= t('page_context.name') %><%= t('page_context.version') %><%= t('page_context.update_time') %><%= t('page_context.last_modified') %><%= t('page_context.action') %>
    + + + + + + + + + - <%= render :partial => 'page_context', :collection => @page_contexts %> + <%= render :partial => 'page_context', :collection => @page_contexts %> -
    <%= t('page_context.name') %><%= t('page_context.version') %><%= t('page_context.update_time') %><%= t('page_context.last_modified') %>
    + + -
    diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb index c5a9871a..d88df80e 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb @@ -1,36 +1,19 @@ -<% content_for :secondary do %> -
    -
    -
    -
    -
    -
      -
    • <%= link_to t('page_context.page_content_list'), panel_page_content_back_end_page_contexts_path %>
      • -
    -<% end -%> <%= flash_messages %> -
    -
    -
    -
    -
    - -

    <%= t('page_context.list_page_content') %>

    - - - - - - - - - +
    <%= t('page_context.name') %><%= t('page_context.version') %><%= t('page_context.update_time') %><%= t('page_context.last_modified') %><%= t('page_context.action') %>
    + + + + + + + + + <%= render :partial => 'view_page_context', :collection => @page_contexts %> -
    <%= t('page_context.name') %><%= t('page_context.version') %><%= t('page_context.update_time') %><%= t('page_context.last_modified') %>
    - -
    + + diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb index 3db38add..0ba3236a 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb @@ -1,6 +1,6 @@ class Panel::WebResource::BackEnd::WebLinkCategorysController < ApplicationController - layout 'admin' + layout 'new_admin' def index @web_link_categorys = WebLinkCategory.all 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 f1ec7485..dfe09ce5 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 @@ -1,7 +1,7 @@ class Panel::WebResource::BackEnd::WebLinksController < ApplicationController - layout 'admin' + layout 'new_admin' before_filter :authenticate_user! before_filter :is_admin? diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb index 7eb698ea..2e0f61ff 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb @@ -1,25 +1,29 @@ <% # encoding: utf-8 %> <%= form_for(@web_link_category, :remote => true, :url => @url) do |f| %> -<%#= form_for(@web_link_category, :remote => true, :url => panel_web_resource_back_end_web_link_category_path(@web_link_category)) do |f| %> -
    - <%= f.label :key %>
    - <%= f.text_field :key %> -
    +

    <%= (@web_link_category.new_record? ? 'Add' : 'Edit') %>

    + +
    + <%= f.label :key %> + <%= f.text_field :key %> +
    + +
    + <%= f.fields_for :i18n_variable, (@web_link_category.new_record? ? @web_link_category.build_i18n_variable : @web_link_category.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> +
    + <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> +
    + <%= f.text_field locale, :class => 'input-xxlarge' %> +
    +
    + <% end %> + <% end %> +
    -
    - <%= f.label :name %>
    - <%= f.fields_for :i18n_variable, (@web_link_category.new_record? ? @web_link_category.build_i18n_variable : @web_link_category.i18n_variable) do |f| %> - <% @site_valid_locales.each do |locale| %> - <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> - <%= f.text_field locale, :style => "width:130px" %> - <% end %> - <% end %> -
    - -
    - <%= f.submit %> +
    + <%= f.submit 'Submit/', :class=>'btn btn-primary' %>
    <% end %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb index d6e27e8d..3f6a1a71 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb @@ -1,12 +1,16 @@ - - <%= web_link_category.key %> - <% @site_valid_locales.each do |locale| %> - <%= web_link_category.i18n_variable[locale] rescue nil %> - <% end %> - - <%= link_to t('web_link_category.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %> | - <%= link_to t('web_link_category.quick_edit'), panel_web_resource_back_end_web_link_category_quick_edit_path(web_link_category), :remote => true %> | - <%= link_to t('web_link_category.delete'), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('sure?'), :method => :delete, :remote => true %> - - \ No newline at end of file + + + + <%= web_link_category.key %> +
    +
      +
    • <%= link_to t('web_link_category.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %>
      • +
    • <%= link_to t('web_link_category.delete'), panel_web_resource_back_end_web_link_category_quick_edit_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
      • +
    +
    + + <% @site_valid_locales.each do |locale| %> + <%= web_link_category.i18n_variable[locale] rescue nil %> + <% end %> + \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb index 45842451..762da9e7 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb @@ -1,43 +1,23 @@ -<% content_for :secondary do %> -
    -
    -
    -
    -
    -
      -
    • <%#= link_to t('web_link_category.new_web_resource_class'), new_panel_web_resource_back_end_web_link_category_path, :class => 'seclink1' %>
      • -
    -<% end -%> + <%= flash_messages %> -

    <%= t('web_link_category.list_web_resource_class') %>

    -
    -
    -
    -
    -
    - - - - <% @site_valid_locales.each do |locale| %> - - <% end %> - - + + + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + + -<%# @web_link_categorys.each do |post| %> <%= render :partial => 'web_link_category', :collection => @web_link_categorys %> -<%# end %> + + -
    -
    -
    -
    - -

    Add New

    <%= render :partial => "form" %>
    - diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb index ce17555a..2abdf4a0 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb @@ -1,62 +1,101 @@ <% # encoding: utf-8 %> <%= f.error_messages %> - <%#= debugger %> - -
    - <%= f.label :category %>
    - <%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %> -
    - -
    - <%= f.label :name %> - <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale %> - - <% end %> - <% end %> -
    - -
    - <%= f.label :url %>
    - <%= f.text_field :url, :size => 60 %> -
    -
    - <%= f.label :describe %> - <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :rows => 10, :cols => 40 %> - - <% end %> - <% end %> -
    + + +
    + +
    +
    + +
    +

    Status

    +
    +
    + <%= f.check_box :is_top %><%= t('top') %> + <%= f.check_box :is_hot %><%= t('hot') %> + <%= f.check_box :is_hidden %><%= t('hide') %> +
    +
    +
    + +
    +
    + +
    +

    Tags

    +
    + <% @tags.each do |tag| %> + <%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%> + <%= tag[I18n.locale] %> + <% end %> +
    +
    -
    - <%= f.label :status %>
    - <%= f.check_box :is_top %><%= t('top') %> - <%= f.check_box :is_hot %><%= t('hot') %> - <%= f.check_box :is_hidden %><%= t('hidden') %> -
    - -
    - <%= f.label :tags %>
    - <% @tags.each do |tag| %> - <%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%> - <%= tag[I18n.locale] %> - <% end %> -
    - -
    -
    +
    -
    - <%= f.submit %> + + + +
    +
    + + <%= f.label :category %> + <%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %> + +
    + + English + + + +
    + +
    + <%= f.label :name %> + <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %> + <% @site_valid_locales.each do |locale| %> + + <%= I18nVariable.from_locale(locale) %> + <%= f.text_field locale, :class=>'post-title' %> + + <% end %> + <% end %> +
    + +
    + <%= f.label :url %> + <%= f.text_field :url %> +
    + +
    + <%= f.label :describe %> + <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %> + <% @site_valid_locales.each do |locale| %> + + <%= I18nVariable.from_locale(locale) %> + <%= f.text_area locale, :style=>"width:100%" %> + + <% end %> + <% end %> +
    + +
    + + + + +
    + <%= f.submit 'Submit/', :class=>'btn btn-primary' %>
    \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb index d87b59d8..c58f15e4 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb @@ -1,5 +1,5 @@ - + <% if post.is_top? %> <%= t(:top) %> @@ -10,6 +10,12 @@ <% if post.is_hidden? %> <%= t(:hidden) %> <% end %> +
    +
      +
    • <%= link_to t('web_link.edit'), edit_panel_web_resource_back_end_web_link_path(post) %>
      • +
    • <%= link_to t('web_link.delete'), panel_web_resource_back_end_web_link_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %>
      • +
    +
    <%= post.web_link_category.i18n_variable[I18n.locale] %> @@ -20,12 +26,5 @@ <%= tag[I18n.locale] %> <% end %> - - <%= link_to t('web_link.edit'), edit_panel_web_resource_back_end_web_link_path(post) %> | - - <%= link_to t(:set_top), eval("panel_web_resource_back_end_web_link_path(post, :authenticity_token => form_authenticity_token, :web_link => {:is_top => true})"), :remote => true, :method => :put, :id => "disable_#{post.id}", :style => "display:#{post.is_top? ? 'none' : ''}", :class => 'switch' %> - <%= link_to t(:cancel_top), eval("panel_web_resource_back_end_web_link_path(post, :authenticity_token => form_authenticity_token, :web_link => {:is_top => false})"), :remote => true, :method => :put, :id => "enable_#{post.id}", :style => "display:#{post.is_top? ? '' : 'none'}", :class => 'switch' %> - - | <%= link_to t('web_link.delete'), panel_web_resource_back_end_web_link_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %> - + 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 82afe4ea..301c1bbe 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 @@ -1,52 +1,21 @@ -<% content_for :secondary do %> -
    -
    -
    -
    -
    -
      -
    • <%= link_to t('web_link.new_link'), new_panel_web_resource_back_end_web_link_path %>
      • -
    • <%= link_to t('web_link.link_list'), panel_web_resource_back_end_web_links_path %>
      • -
    • <%= link_to t('web_link.new_link_class'), panel_web_resource_back_end_web_link_categorys_path %>
      • -
    -<% end -%> <%= flash_messages %> -
    -
    -
    -
    -
    - - <%= form_for :web_link, :action => 'search', :method => 'get', :url => panel_web_resource_back_end_web_links_path do |f| %> - - <%#= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ] },{ :include_blank => t('web_link.select') }%> - - Category <%= select_tag "category_id", options_for_select(@web_link_categorys.collect{|t| [t.i18n_variable[I18n.locale], t.id]}), :prompt => t('web_link.select') %> - - <%= submit_tag "OK", :name => nil %> - - <% end %> - -
    -
    - -

    <%= t('web_link.list_link') %>

    - - - - - - - - - +
    <%= t('web_link.status') %><%= t('web_link.category') %><%= t('web_link.name') %><%= t('web_link.tags') %><%= t('web_link.action') %>
    + + + + + + + + + <% @web_links.each do |post| %> <%= render :partial => 'web_links', :locals => {:post => post} %> - <% end %> -
    <%= t('web_link.status') %><%= t('web_link.category') %><%= t('web_link.name') %><%= t('web_link.tags') %>
    - -
    + <% end %> + + + From 13b6892f873e625aeff2ce7b640b2a2d9ee4d586 Mon Sep 17 00:00:00 2001 From: Matt Fu Date: Fri, 16 Mar 2012 11:09:44 +0800 Subject: [PATCH 010/125] code for new fact check --- app/controllers/orbit_backend_controller.rb | 1 + app/views/layouts/_side_bar.html.erb | 1 + lib/tasks/anc_tasks.rake | 12 +-- .../back_end/bulletins_controller.rb | 7 +- .../back_end/fact_checks_controller.rb | 92 +++++++++++++------ .../announcement/app/models/bulletin.rb | 3 + .../back_end/bulletins/_bulletin.html.erb | 5 +- .../back_end/bulletins/_form.html.erb | 13 ++- .../back_end/bulletins/_quick_edit.html.erb | 10 +- .../back_end/bulletins/index.html.erb | 1 - .../back_end/fact_checks/_list_table.html.erb | 15 --- .../back_end/fact_checks/index.html.erb | 40 -------- .../announcement/config/locales/en.yml | 6 ++ .../announcement/config/locales/zh_tw.yml | 7 ++ .../announcement/config/routes.rb | 5 +- 15 files changed, 114 insertions(+), 104 deletions(-) delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb index d3639ebe..b52384c6 100644 --- a/app/controllers/orbit_backend_controller.rb +++ b/app/controllers/orbit_backend_controller.rb @@ -4,6 +4,7 @@ class OrbitBackendController< ApplicationController # before_filter {|c| c.front_end_available(@app_title)} before_filter :check_user_can_use,:except => [:public] include OrbitCoreLib::PermissionUnility + include AdminHelper layout 'admin' diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 33e41597..d287e46c 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -9,6 +9,7 @@ <%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %> <%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %> <%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %> + <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') %> <% end -%> <% end -%> diff --git a/lib/tasks/anc_tasks.rake b/lib/tasks/anc_tasks.rake index 3145d119..cd534b93 100644 --- a/lib/tasks/anc_tasks.rake +++ b/lib/tasks/anc_tasks.rake @@ -11,12 +11,12 @@ namespace :anc do bulletin_category_3.create_i18n_variable(:en => "MattCheckChrisPreview", :zh_tw => 'MattCheckChrisPreview') - bulletin_1 = Bulletin.create(:title => "C1P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_1 ) - bulletin_2 = Bulletin.create(:title => "C1P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_1 ) - bulletin_3 = Bulletin.create(:title => "C2P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_2 ) - bulletin_4 = Bulletin.create(:title => "C2P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_2 ) - bulletin_5 = Bulletin.create(:title => "C3P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_3 ) - bulletin_6 = Bulletin.create(:title => "C3P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_3 ) + bulletin_1 = Bulletin.create(:title => "C1P1",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_1 ) + bulletin_2 = Bulletin.create(:title => "C1P2",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_1 ) + bulletin_3 = Bulletin.create(:title => "C2P1",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_2 ) + bulletin_4 = Bulletin.create(:title => "C2P2",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_2 ) + bulletin_5 = Bulletin.create(:title => "C3P1",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_3 ) + bulletin_6 = Bulletin.create(:title => "C3P2",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_3 ) end end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index dcd3de04..e8eb6149 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -1,5 +1,4 @@ -class Panel::Announcement::BackEnd::BulletinsController < ApplicationController - +class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController layout 'new_admin' before_filter :authenticate_user! @@ -151,7 +150,6 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController elsif is_sub_manager? @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new') end -<<<<<<< HEAD end def get_sorted_bulletins @@ -196,8 +194,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController a.flatten! a.uniq end -======= ->>>>>>> 26cd6951dba43b1f6eaf5056160309c5c77a8716 + end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb index dd471958..c47e91fb 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb @@ -1,38 +1,76 @@ class Panel::Announcement::BackEnd::FactChecksController < OrbitBackendController before_filter :authenticate_user! include AdminHelper - layout 'admin' + # layout 'admin' + layout 'new_admin' - def index - @bulletin_categorys_submit_new = [] - @bulletin_categorys_check =[] - if is_admin? || is_manager? - #@bulletin_categorys_submit_new = BulletinCategory.all - @bulletin_categorys_check = BulletinCategory.all - # elsif is_sub_manager? - # @bulletin_categorys_submit_new = BulletinCategory.authed_for_user(current_user,'submit_new') - # @bulletin_categorys_check = BulletinCategory.authed_for_user(current_user,'fact_check') + def setting + @bulletin_categorys = BulletinCategory.all + if params.has_key?(:category_id) + first_category = BulletinCategory.find params[:category_id] + if params[:commit] == 'Update' + privilege_users = params[:users].collect{|key,value| User.find key } rescue [] + preload_object_auth_ary = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check') + preload_object_auth = preload_object_auth_ary.first + preload_object_auth.privilege_users = privilege_users + preload_object_auth.save! + end + else + first_category = @bulletin_categorys.first + end + preload_object_auth = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check') + @users_array = preload_object_auth.first.privilege_users rescue [] + respond_to do |format| + format.html + format.js end end - def new + def update_setting end - - def create - + # def index + # get_categorys(params[:bulletin_category_id]) + # + # @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all + # @bulletin_categories = BulletinCategory.all + # + # module_app = ModuleApp.first(:conditions => {:key => 'announcement'}) + # @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc) + # + # respond_to do |format| + # format.html # index.html.erb + # format.js + # format.xml { render :xml => @bulletins } + # end + # end + # + # def new + # + # end + # + # def create + # + # end + # + # def update + # + # end + # + # def edit + # + # end + # + # def destroy + # + # end + protected + def get_categorys(id = nil) + @bulletin_categorys = [] + if(is_manager? || is_admin?) + @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true)) + elsif is_sub_manager? + @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new') + end end - - def update - - end - - def edit - - end - - def destroy - - end - end diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index 188142ea..e68e2c97 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -19,6 +19,9 @@ class Bulletin field :is_top, :type => Boolean, :default => false field :is_hot, :type => Boolean, :default => false field :is_hidden, :type => Boolean, :default => false + field :is_checked, :type => Boolean, :default => false + + field :not_checked_reason field :public, :type => Boolean, :default => true diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index 3f6f50e1..e12af233 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -24,11 +24,12 @@
  • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    • +
  • <%= link_to t('bulletin.fact_check'), edit_panel_announcement_back_end_bulletin_path(bulletin) %>
    • <%#= #TODO add ancher so user can quick access into that part %>
    <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> - <%= link_to bulletin.title[I18n.locale], panel_announcement_back_end_bulletin_path(bulletin) %> + <%= link_to bulletin.title[I18n.locale], panel_announcement_back_end_bulletin_path(bulletin) rescue ''%> <%= bulletin.postdate %> <%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %> @@ -36,7 +37,7 @@ <%= tag[I18n.locale] %> <% end %> - <%= User.from_id(bulletin.update_user_id).name %> + <%= User.from_id(bulletin.update_user_id).name rescue ''%> <%= render :partial => 'quick_edit', :locals => {:bulletin => bulletin} %> 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 751a5f12..2236b5ed 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 @@ -2,7 +2,16 @@ <%= f.error_messages %> <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %> - +
    + <%= label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %> + <%= f.radio_button :is_checked, true%> + <%= label :is_checked_true, t('announcement.bulletin.fact_check_pass') %> + <%= f.radio_button :is_checked, false, (@bulletin.is_checked.nil?? {:checked => true} : {}) %> + <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass') %> + + <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %> + <%= f.text_field :not_checked_reason %> +
    <%= f.label :image, t('announcement.image') %>
    <%= f.file_field :image %> @@ -523,6 +532,8 @@
    --> + + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb index 91726d88..96e8237c 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb @@ -3,11 +3,11 @@ <%= t(:quick_edit) %> - Basic / Picture / Tags / Link / File <%= form_for bulletin, :url => panel_announcement_back_end_bulletin_path(bulletin), :html => {:class => 'form-horizontal'} do |f| %> - <%= render :partial => "quick_edit_basic", :locals => { :f => f, :bulletin => bulletin } %> - <%= render :partial => "quick_edit_picture", :locals => { :f => f, :bulletin => bulletin } %> - <%= render :partial => "quick_edit_tags", :locals => { :f => f, :bulletin => bulletin } %> - <%= render :partial => "quick_edit_links", :locals => { :f => f, :bulletin => bulletin } %> - <%= render :partial => "quick_edit_files", :locals => { :f => f, :bulletin => bulletin } %> + <%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_basic", :locals => { :f => f, :bulletin => bulletin } %> + <%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_picture", :locals => { :f => f, :bulletin => bulletin } %> + <%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_tags", :locals => { :f => f, :bulletin => bulletin } %> + <%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_links", :locals => { :f => f, :bulletin => bulletin } %> + <%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_files", :locals => { :f => f, :bulletin => bulletin } %>
    <%= f.submit t(:submit), :class => 'btn btn-primary' %> <%= f.submit t(:cancel), :class => 'btn', :type => 'reset' %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb index fd2b29b5..c833297a 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb @@ -2,7 +2,6 @@ <%= render 'bulletins' %>
    -
    <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb deleted file mode 100644 index 59bac03a..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -

    <%= bulletin_category.key %>

    - - - - - - - - - - -<% bulletin_category.bulletins.each do |post| %> - <%= render :partial => 'panel/announcement/back_end/bulletins/bulletins', :locals => {:post => post,:fact_check_allow=>true} %> -<% end %> -
    <%= t('bulletin.status') %><%= t('bulletin.category') %><%= t('bulletin.title') %><%= t('bulletin.postdate') %><%= t('bulletin.deadline') %><%= t('bulletin.action') %>
    \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb deleted file mode 100644 index 6f878b06..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb +++ /dev/null @@ -1,40 +0,0 @@ -<% content_for :secondary do %> -<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %> -<% end -%> - -<%= flash_messages %> - -
    -
    -
    -
    -
    - -
    <%= t('bulletin.search') %> - - <%= form_for :bulletin, :action => 'search', :method => 'get', :url => panel_announcement_back_end_bulletins_path do |f| %> - - <%#= f.select :bulletin_category_id, @bulletin_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ] },{ :include_blank => t('bulletin.select') }%> - - Category <%#= select_tag "category_id", options_for_select(@bulletin_categorys.collect{|t| [t.i18n_variable[I18n.locale], t.id]}), :prompt => t('bulletin.select') %> - - KeyWord <%#= text_field_tag :search, params[:search], :id => 'search_field' %> - - <%= submit_tag "Search", :name => nil %> - - <% end %> - - -
    - -
    -
    - -

    <%= t('bulletin.list_announcement') %>

    - -
    -

    Check Please

    - <%= render :partial => "list_table", :collection => @bulletin_categorys_check,:as => :bulletin_category%> -
    -
    - diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml index 1f544b28..6143b177 100644 --- a/vendor/built_in_modules/announcement/config/locales/en.yml +++ b/vendor/built_in_modules/announcement/config/locales/en.yml @@ -35,6 +35,12 @@ en: list_lower: " list" title: Title postdate: Postdate + fact_check: Fact Check + fact_check_setting: Fact Check Setting + fact_check_stat: Fact Check Status + fact_check_not_pass: 'Not Pass' + fact_check_not_pass_reason: 'Reason' + fact_check_pass: 'Pass' # admin: # action: Action # add_language: Add language diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml index a9da545b..e2dfd957 100644 --- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml @@ -30,6 +30,13 @@ zh_tw: list_lower: 銵 title: 璅憿 postdate: 撘菔票交 + fact_check: 砍撖拇 + fact_check_setting: 撖拇貉身摰 + fact_check_stat: 撖拇貊瘜 + fact_check_not_pass: '銝' + fact_check_pass: '' + fact_check_not_pass_reason: '銝' + # admin: # action: 銵 # add_language: 啣隤閮 diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index cb39d253..f6f30b31 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -3,8 +3,9 @@ Rails.application.routes.draw do namespace :announcement do namespace :back_end do match 'public' => "announcements#public",:as => :public - resources :fact_checks - match 'list_mine' => "announcements#list_mine" + match 'fact_check_setting' => "fact_checks#setting" ,:as => :fact_checks_setting + match 'update_setting' => "fact_checks#update_setting" ,:as => :fact_checks_update_setting + root :to => "bulletins#index" resources :bulletins resources :bulletin_categorys, :controller => 'bulletin_categorys' do From b6d49df1453c8c3c0f6b0a080c2b0f3805030bac Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Fri, 16 Mar 2012 11:20:16 +0800 Subject: [PATCH 011/125] Change Obit to Orbit --- app/controllers/orbit_widget_controller.rb | 2 +- .../panel/announcement/back_end/bulletins_controller.rb | 1 - .../panel/announcement/front_end/bulletins_controller.rb | 2 +- .../panel/announcement/widget/bulletins_controller.rb | 2 +- .../app/controllers/panel/new_blog/widget/posts_controller.rb | 2 +- .../panel/page_content/front_end/page_contexts_controller.rb | 2 +- .../panel/web_resource/front_end/web_links_controller.rb | 2 +- .../panel/web_resource/widget/web_links_controller.rb | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/controllers/orbit_widget_controller.rb b/app/controllers/orbit_widget_controller.rb index c2be4691..47e24fe0 100644 --- a/app/controllers/orbit_widget_controller.rb +++ b/app/controllers/orbit_widget_controller.rb @@ -1,3 +1,3 @@ -class ObitWidgetController< OrbitFrontendComponentController +class OrbitWidgetController< OrbitFrontendComponentController end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index e8eb6149..c6eb0180 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -194,7 +194,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController a.flatten! a.uniq end - end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb index e840d65f..ff3cbdc9 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb @@ -1,4 +1,4 @@ -class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController +class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController def initialize super diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index 333f88e7..60aad3d9 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -1,4 +1,4 @@ -class Panel::Announcement::Widget::BulletinsController < ObitWidgetController +class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController def initialize super diff --git a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb index dab532ee..73098dda 100644 --- a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb +++ b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb @@ -1,4 +1,4 @@ -class Panel::NewBlog::Widget::PostsController < ObitWidgetController +class Panel::NewBlog::Widget::PostsController < OrbitWidgetController # GET /posts # GET /posts.xml def index diff --git a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb index 8b750dcc..5b46866b 100644 --- a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb +++ b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb @@ -1,4 +1,4 @@ -class Panel::PageContent::FrontEnd::PageContextsController < ObitWidgetController +class Panel::PageContent::FrontEnd::PageContextsController < OrbitWidgetController def initialize super diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb index c230140d..54374ed3 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb @@ -1,4 +1,4 @@ -class Panel::WebResource::FrontEnd::WebLinksController < ObitWidgetController +class Panel::WebResource::FrontEnd::WebLinksController < OrbitWidgetController def initialize super diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb index bbe4a8d9..750897ae 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb @@ -1,4 +1,4 @@ -class Panel::WebResource::Widget::WebLinksController < ObitWidgetController +class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController def initialize super From 6f6e84b0157e301f117bcd28aa867b1ef4eec96a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Mar 2012 20:05:03 +0800 Subject: [PATCH 012/125] fix dashboard & announcement --- app/assets/javascripts/bulletin_form.js.erb | 3 +- app/views/layouts/_side_bar.html.erb | 14 +- .../back_end/bulletins_controller.rb | 51 ++- .../announcement/app/models/bulletin.rb | 26 +- .../announcement/app/models/bulletin_file.rb | 22 +- .../announcement/app/models/bulletin_link.rb | 8 +- .../_bulletin_category.html.erb | 40 ++- .../bulletin_categorys/_form.html.erb | 54 +-- .../bulletin_categorys/_quick_edit.html.erb | 13 + .../_quick_edit_qe.html.erb | 28 ++ .../bulletin_categorys/index.html.erb | 41 +-- .../bulletins/_bulletin_file.html.erb | 16 +- .../bulletins/_bulletin_link.html - 複製.erb | 27 ++ .../bulletins/_bulletin_link.html.erb | 10 +- .../bulletins/_bulletin_link2.html - 複製.erb | 16 + .../bulletins/_bulletin_link2.html.erb | 17 + .../bulletins/_bulletin_link_qe.html.erb | 41 +++ .../back_end/bulletins/_form.html.erb | 322 +++++++++++++----- .../bulletins/_quick_edit_links.html.erb | 34 +- .../bulletins/_quick_edit_picture.html.erb | 13 +- .../back_end/bulletins/index.html - 複製.erb | 9 + .../back_end/bulletins/link_quick_edit.js.erb | 2 + .../back_end/bulletins/show.html.erb | 10 +- .../announcement/config/routes.rb | 5 +- .../back_end/page_contexts/_form.html.erb | 51 +-- .../page_contexts/_page_context.html.erb | 22 +- .../page_contexts/_view_page_context.html.erb | 23 +- .../back_end/page_contexts/edit.html.erb | 10 +- .../back_end/page_contexts/index.html.erb | 42 +-- .../back_end/page_contexts/view.html.erb | 41 +-- .../back_end/web_link_categorys_controller.rb | 2 +- .../back_end/web_links_controller.rb | 2 +- .../web_link_categorys/_form.html.erb | 38 ++- .../_web_link_category.html.erb | 26 +- .../web_link_categorys/index.html.erb | 46 +-- .../back_end/web_links/_form.html.erb | 145 +++++--- .../back_end/web_links/_web_links.html.erb | 17 +- .../back_end/web_links/index.html.erb | 59 +--- 38 files changed, 849 insertions(+), 497 deletions(-) create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb index 5002cfae..17f86060 100644 --- a/app/assets/javascripts/bulletin_form.js.erb +++ b/app/assets/javascripts/bulletin_form.js.erb @@ -1,4 +1,4 @@ -$('.bulletin_urls_block a.delete').live('click', function(){ +$('.bulletin_links_block a.delete').live('click', function(){ $(this).parents('.list_item').remove(); }); @@ -9,4 +9,5 @@ $('.bulletin_files_block a.delete').live('click', function(){ $('.action a.remove_existing_record').live('click', function(){ $(this).next('.should_destroy').attr('value', 1); $("#bulletin_" + $(this).prev().attr('value')).hide(); + $("tr#bulletin_" + $(this).prev().attr('value')).hide(); }); \ No newline at end of file diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index d287e46c..44f448fd 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -17,17 +17,25 @@ <%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %> <% end -%> -<%= content_tag :li, :class => active_for_controllers(nil) do -%> +<%= content_tag :li, :class => active_for_controllers('page_contexts') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-page') + t('admin.page'), panel_page_content_back_end_page_contexts_path %> + <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%> + <%= content_tag :li, link_to(t('admin.all_articles'), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %> + <% end -%> <% end -%> <%= content_tag :li, :class => active_for_controllers('designs') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %> <% end -%> -<%= content_tag :li, :class => active_for_controllers(nil) do -%> +<%= content_tag :li, :class => active_for_controllers('web_links', 'tags', 'web_link_categorys') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %> -<% end -%> + <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', 'tags', 'web_link_categorys')) do -%> + <%= content_tag :li, link_to(t('admin.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_link', 'index') %> + <%= content_tag :li, link_to(t('admin.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %> + <%= content_tag :li, link_to(t('admin.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %> + <%= content_tag :li, link_to(t('admin.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('tags', 'index') %> + <% end -%> <%= content_tag :li, :class => active_for_controllers(nil) do -%> <%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), nil %> diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index c6eb0180..8b86a7a4 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -8,6 +8,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletins = Bulletin.all # @bulletins = Bulletin.desc("postdate desc") get_categorys(params[:bulletin_category_id]) + get_tags # @bulletins = Bulletin.where("bulletin_category_id" => params[:bulletin_category_id]).desc("postdate") if params[:bulletin_category_id] @@ -15,9 +16,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]]) @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all @bulletin_categories = BulletinCategory.all - - module_app = ModuleApp.first(:conditions => {:key => 'announcement'}) - @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc) respond_to do |format| format.html # index.html.erb @@ -30,6 +28,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # GET /bulletins/1.xml def show @bulletin = Bulletin.find(params[:id]) + get_tags # get_categorys # @bulletin_categorys = BulletinCategory.where("_id" => params[:id]) @@ -50,11 +49,14 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # GET /bulletins/new.xml def new @bulletin = Bulletin.new + + @link_url = panel_announcement_back_end_bulletins_path # @bulletin.bulletin_files.build # @bulletin.bulletin_files.new get_categorys + get_tags respond_to do |format| format.html # new.html.erb @@ -66,7 +68,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController def edit @bulletin = Bulletin.find(params[:id]) # @summary_variable = @bulletin.summary_variable + + @link_url = panel_announcement_back_end_bulletin_path(@bulletin) + get_categorys + get_tags end # POST /bulletins @@ -89,6 +95,32 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController end end + def link_quick_add + # debugger + + @bulletin = Bulletin.find(params[:bulletin_id]) + + @link_url = panel_announcement_back_end_bulletins_path + + respond_to do |format| + format.js + end + + end + + def link_quick_edit + # debugger + + @bulletin = Bulletin.find(params[:bulletin_id]) + + @link_url = panel_announcement_back_end_bulletin_path(@bulletin) + + respond_to do |format| + format.js + end + + end + # PUT /bulletins/1 # PUT /bulletins/1.xml def update @@ -97,11 +129,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController @bulletin.update_user_id = current_user.id # @bulletin.image.clear if params[:bulletin][:image_del] == '1' - if params[:bulletin][:image_del] == '1' - @bulletin.remove_image! + # if params[:bulletin][:image_del] == '1' + # @bulletin.remove_image! # @bulletin.image_del = nil - params[:bulletin][:image_del] = nil - end + # params[:bulletin][:image_del] = nil + # end respond_to do |format| if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save @@ -151,6 +183,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new') end end + + def get_tags + module_app = ModuleApp.first(:conditions => {:key => 'announcement'}) + @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc) + end def get_sorted_bulletins bulletins = Bulletin.all diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index e68e2c97..d1b7f3c5 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -29,10 +29,11 @@ class Bulletin belongs_to :bulletin_category - embeds_many :bulletin_links, :cascade_callbacks => true - embeds_many :bulletin_files, :cascade_callbacks => true + # embeds_many :bulletin_links, :cascade_callbacks => true + # embeds_many :bulletin_files, :cascade_callbacks => true - # has_many :bulletin_files, :autosave => true, :dependent => :destroy + has_many :bulletin_links, :autosave => true, :dependent => :destroy + has_many :bulletin_files, :autosave => true, :dependent => :destroy accepts_nested_attributes_for :bulletin_files, :allow_destroy => true accepts_nested_attributes_for :bulletin_links, :allow_destroy => true @@ -41,6 +42,9 @@ class Bulletin before_save :set_key + after_save :save_bulletin_links + after_save :save_bulletin_files + def self.search( search = nil, category_id = nil ) @@ -97,6 +101,22 @@ class Bulletin self.is_hidden end + def save_bulletin_links + self.bulletin_links.each do |t| + if t.should_destroy + t.destroy + end + end + end + + def save_bulletin_files + self.bulletin_files.each do |t| + if t.should_destroy + t.destroy + end + end + end + def title @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb index 28062d40..05894515 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb @@ -5,13 +5,27 @@ class BulletinFile mount_uploader :file, AssetUploader - field :filetitle - field :description + # field :filetitle + # field :description + has_one :filetitle, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + has_one :description, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy # field :to_save, :type => Boolean field :should_destroy, :type => Boolean - # belongs_to :bulletin - embedded_in :bulletin + belongs_to :bulletin + # embedded_in :bulletin + + + protected + + def set_key + if filetitle.new_record? + filetitle.key = 'filetitle' + end + if description.new_record? + description.key = 'description' + end + end end diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb index a999d45d..30363182 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb @@ -4,10 +4,12 @@ class BulletinLink include Mongoid::Timestamps field :url - field :name + # field :name + + has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy field :should_destroy, :type => Boolean - embedded_in :bulletin - + # embedded_in :bulletin + belongs_to :bulletin end 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 e834ec60..9c95881a 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 @@ -1,21 +1,25 @@ - - <%= bulletin_category.key %> - <% @site_valid_locales.each do |locale| %> - <%= bulletin_category.i18n_variable[locale] rescue nil %> - <% end %> - <%= bulletin_category.display %> - <% if is_manager? %> + - <%= link_to t('blog.new_auth'), init_admin_object_auths_path("BulletinCategory",bulletin_category,:token => @module_app.token) %>
    - <% bulletin_category.object_auths.each do |obj_auth| %> - <%= link_to obj_auth.title,edit_admin_object_auth_url(obj_auth,:token => @module_app.token) %>
    - <% end %> + <%= bulletin_category.key %> +
    +
      + <% if is_manager? %> + + <%= link_to t('blog.new_auth'), init_admin_object_auths_path("BulletinCategory",bulletin_category,:token => @module_app.token) %>
      + <% bulletin_category.object_auths.each do |obj_auth| %> + <%= link_to obj_auth.title,edit_admin_object_auth_url(obj_auth,:token => @module_app.token) %>
      + <% end %> + <% end %> + +
    • <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %>
      • +
    • <%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %>
      • +
    • <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
      • +
    +
    - - <% end %> - <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %> | - <%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %> | - <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %> - - \ No newline at end of file + <% @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/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb index d7bfac7b..1ce7f629 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb @@ -1,36 +1,36 @@ <% # encoding: utf-8 %> <%= form_for(@bulletin_category, :remote => true, :url => @url) do |f| %> -<%#= form_for(@bulletin_category, :remote => true, :url => panel_announcement_back_end_bulletin_category_path(@bulletin_category)) do |f| %> -
    - <%= f.label :key %>
    - <%= f.text_field :key %> -
    - -
    - <%= f.label :name %>
    - <%= f.fields_for :i18n_variable, (@bulletin_category.new_record? ? @bulletin_category.build_i18n_variable : @bulletin_category.i18n_variable) do |f| %> - <% @site_valid_locales.each do |locale| %> - <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> - <%= f.text_field locale, :style => "width:130px" %> - <% end %> - <% end %> -
    - -
    - <%= f.label :display %>
    - <%#= f.select :display, BulletinCategory::PAYMENT_TYPES, :prompt => 'Select a display method' %> +

    <%= (@bulletin_category.new_record? ? 'Add' : 'Edit') %>

    - <%= f.radio_button :display, "List" %>List - <%#= f.label :display, 'list', :value => '1', :checked => @a %> - <%= f.radio_button :display, "Picture" %>Picture - <%#= f.label :display, 'picture', :value => '2', :checked => @b %> -
    憿舐內孵航身摰典圈Ｘ嚗鞈閮曄璅撘 -
    +
    + <%= f.label :key %> + <%= f.text_field :key %> +
    + +
    + <%= f.fields_for :i18n_variable, (@bulletin_category.new_record? ? @bulletin_category.build_i18n_variable : @bulletin_category.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> +
    + <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> +
    + <%= f.text_field locale, :class => 'input-xxlarge' %> +
    +
    + <% end %> + <% end %> +
    + +
    + <%= f.label :display %> + <%= f.radio_button :display, "List" %>List + <%= f.radio_button :display, "Picture" %>Picture +
    憿舐內孵航身摰典圈Ｘ嚗鞈閮曄璅撘 +
    -
    - <%= f.submit %> +
    + <%= f.submit 'Submit/', :class=>'btn btn-primary' %>
    <% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb new file mode 100644 index 00000000..14a72951 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit.html.erb @@ -0,0 +1,13 @@ + + + + <%= t(:quick_edit) %> + <%= form_for bulletin_category, :url => panel_announcement_back_end_bulletin_category_path(bulletin_category), :html => {:class => 'form-horizontal'} do |f| %> + <%= render :partial => "quick_edit_qe", :locals => { :f => f, :bulletin_category => bulletin_category } %> +
    + <%= f.submit t(:submit), :class => 'btn btn-primary' %> + <%= f.submit t(:cancel), :class => 'btn', :type => 'reset' %> +
    + <% end %> + + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb new file mode 100644 index 00000000..cb32d861 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb @@ -0,0 +1,28 @@ +<% # encoding: utf-8 %> + +
    + +
    + <%= f.label :key %> + <%= f.text_field :key %> +
    +
    + <%= f.fields_for :i18n_variable, bulletin_category.i18n_variable do |f| %> + <% @site_valid_locales.each do |locale| %> +
    + <%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> +
    + <%= f.text_field locale, :class => 'input-xxlarge' %> +
    +
    + <% end %> + <% end %> +
    + +
    + <%= f.label :display %> + <%= f.radio_button :display, "List" %>List + <%= f.radio_button :display, "Picture" %>Picture +
    憿舐內孵航身摰典圈Ｘ嚗鞈閮曄璅撘 +
    +
    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 87b30a04..0a6e7f83 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 @@ -1,38 +1,23 @@ -<% content_for :secondary do %> -<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %> -<% end -%> <%= flash_messages %> -
    -
    -
    -
    -
    + + + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + + + -

    <%= t('bulletin_category.list_announcement_class') %>

    - -
    <%= t('bulletin_category.key') %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %><%= t('bulletin_category.display') %>
    - - - <% @site_valid_locales.each do |locale| %> - - <% end %> - - - - -<%# @bulletin_categorys.each do |post| %> <%= render :partial => 'bulletin_category', :collection => @bulletin_categorys %> -<%# end %> + +
    <%= t('bulletin_category.key') %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %><%= t('bulletin_category.display') %><%= t('bulletin.action') %>
    -
    -
    -
    -
    - -

    Add New

    <%= render :partial => "form" %>
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb index 86785ee0..6da49ceb 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb @@ -6,10 +6,22 @@ <%= f.file_field :file %> <%= f.label :file_title %> - <%= f.text_field :filetitle %> + <%#= f.text_field :filetitle %> + <%= f.fields_for :filetitle, (bulletin_file.new_record? ? bulletin_file.build_filetitle : bulletin_file.filetitle ) do |f| %> + <% @site_valid_locales.each do |locale| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_field locale %> + <% end %> + <% end %> <%= f.label :file_description %> - <%= f.text_field :description %> + <%#= f.text_field :description %> + <%= f.fields_for :description, (bulletin_file.new_record? ? bulletin_file.build_description : bulletin_file.description ) do |f| %> + <% @site_valid_locales.each do |locale| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_field locale %> + <% end %> + <% end %> <% if bulletin_file.new_record? %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb new file mode 100644 index 00000000..33d1ba1e --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - 複製.erb @@ -0,0 +1,27 @@ + +
    " class='list_item'> +
    + + <%= f.label :link_url %> + <%= f.text_field :url %> + + <%= f.label :link_name %> + <%#= f.text_field :name %> + <%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> + <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> + <%= f.text_field locale, :style => "width:130px" %> + <% end %> + <% end %> + + + <% if bulletin_link.new_record? %> + <%= t(:delete) %> + <% else %> + <%= f.hidden_field :id %> + <%= t(:delete) %> + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> + <% end %> + +
    +
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb index 44c7ab75..e0077384 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb @@ -1,12 +1,18 @@ -
    " class='list_item'> +
    " class='list_item'>
    <%= f.label :link_url %> <%= f.text_field :url %> <%= f.label :link_name %> - <%= f.text_field :name %> + <%#= f.text_field :name %> + <%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> + <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> + <%= f.text_field locale, :style => "width:130px" %> + <% end %> + <% end %> <% if bulletin_link.new_record? %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb new file mode 100644 index 00000000..c44b5c92 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - 複製.erb @@ -0,0 +1,16 @@ + + "> + <%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %> + <%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %> + + + <%= f.hidden_field :id %> + + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> + + + + + + + \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb new file mode 100644 index 00000000..a3bc5243 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html.erb @@ -0,0 +1,17 @@ + + "> + <%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %> + <%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %> + + + + <%= f.hidden_field :id %> + + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> + + + + + + + \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb new file mode 100644 index 00000000..7208f73c --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb @@ -0,0 +1,41 @@ +<% # encoding: utf-8 %> + + <%= form_for(@bulletin.bulletin_links, :remote => true, :url => @link_url) do |f| %> + + + + <% end %> + + + \ No newline at end of file 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 2236b5ed..35137b4f 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 @@ -20,108 +20,246 @@ <%= t('announcement.芷文歇銝單獢') %> <% end %>
    + + + +
    + +
    +
    + +
    +

    Picture

    +
    +
    + +
    + + +
    + +
    + <% if @bulletin.image.file %> + <%= f.check_box :remove_image %> + <%= t('announcement.芷文歇銝單獢') %> + <% end %> +
    +
    +
    +
    -
    - <%= f.label :title %> - <%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale %> - - <% end %> - <% end %> -
    - -
    - <%= f.label :subtitle %> - <%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :rows => 10, :cols => 40 %> - - <% end %> - <% end %> -
    +
    +
    + +
    +

    Date

    +
    +
    + +
    + <%= 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 :deadline, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'input-small'} %> +
    +
    +
    +
    + +
    +
    + +
    +

    Status

    +
    +
    + <%= f.check_box :is_top %><%= t('top') %> + <%= f.check_box :is_hot %><%= t('hot') %> + <%= f.check_box :is_hidden %><%= t('hide') %> +
    +
    +
    -
    - <%= f.label :text %> - <%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :rows => 10, :cols => 40 %> - - <% end %> - <% end %> +
    +
    + +
    +

    Tags

    +
    + <% @tags.each do |tag| %> + <%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%> + <%= tag[I18n.locale] %> + <% end %> +
    +
    +
    -
    - <%= f.label :postdate %>
    - <%= f.date_select :postdate, :order => [:year, :month, :day], :use_month_numbers => true %> - <%#= date_select("bulletin", "postdate", :use_month_numbers => true) %> -
    -
    - <%= f.label :deadline %>
    - <%= f.date_select :deadline, :use_month_numbers => true, :prompt => { :day => 'Select day', :month => 'Select month', :year => 'Select year'} %> - <%#= f.date_select :deadline, :order => [:year, :month, :day],:default => 1.years.from_now, :use_month_numbers => true %> -
    - -
    - <%#= f.label :url %>
    - <%#= f.text_field :url, :size => 60 %> -
    - - -
    - +
    Please correct the error
    -
    - -
    - - Please correct the error -
    -
    -
    - -
    - - Please correct the error -
    -
    + + <% @site_valid_locales.each do |locale| %> +
    + +
    + + Please correct the error +
    +
    + <% end %> +
    +
    Submit/蝣箏 Cancel/瘨 diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb index 6e7c656a..ff59280f 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb @@ -5,13 +5,18 @@
    - +
    +
    + <% if bulletin.image.file %> + <%= f.check_box :remove_image %> + <%= t('announcement.芷文歇銝單獢') %> + <% end %>
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb new file mode 100644 index 00000000..d37d2134 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - 複製.erb @@ -0,0 +1,9 @@ +<%= render 'filter' %> + + <%= render 'bulletins' %> +
    + +
    + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %> +
    + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb new file mode 100644 index 00000000..cbe5e3c7 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb @@ -0,0 +1,2 @@ +//$.each($(".quick_edit"),function(obj){ $(this).remove(); }); +$("#<%= "bulletin_#{bulletin_link2.id}" %>").append("<%= j render "bulletin_link_qe" %>"); diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb index 7b886e77..5a33b86a 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb @@ -21,7 +21,7 @@
  • <%= t('announcement.title') %> - <%= @bulletin.title %> + <%= @bulletin.title[I18n.locale] %>
  • <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %> @@ -29,23 +29,23 @@
  • <%= t('announcement.subtitle') %> - <%= @bulletin.subtitle %> + <%= @bulletin.subtitle[I18n.locale].html_safe %>
  • <%= t('announcement.text') %> - <%= @bulletin.text %> + <%= @bulletin.text[I18n.locale].html_safe %>
  • <%= t('announcement.link') %> <% @bulletin.bulletin_links.each do | blink | %> - <%= link_to blink.name, blink.url, :target => '_blank' %> + <%= link_to blink.i18n_variable[I18n.locale], blink.url, :target => '_blank' %> <% end %>
  • <%= t('announcement.file') %> <% @bulletin.bulletin_files.each do | bfile | %> - <%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %> + <%= link_to bfile.filetitle[I18n.locale], bfile.file.url, {:target => '_blank', :title => bfile.description[I18n.locale]} if bfile.file.file %> <% end %>
  • diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index f6f30b31..61056e49 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -7,7 +7,10 @@ Rails.application.routes.draw do match 'update_setting' => "fact_checks#update_setting" ,:as => :fact_checks_update_setting root :to => "bulletins#index" - resources :bulletins + resources :bulletins do + match "link_quick_add/:bulletin_id" => "bulletins#link_quick_add" ,:as => :link_quick_add + match "link_quick_edit/:bulletin_id" => "bulletins#link_quick_edit" ,:as => :link_quick_edit + end resources :bulletin_categorys, :controller => 'bulletin_categorys' do match "quick_edit/:bulletin_category_id" => "bulletin_categorys#quick_edit" ,:as => :quick_edit end diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb index e5c7fc45..4ca568a9 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb @@ -1,31 +1,32 @@ <% # encoding: utf-8 %> - <%= f.error_messages %> - <%#= debugger %> - -
    - <%= f.label :name %> - <%= @page_context.page.i18n_variable[I18n.locale] %> -
    +<%= f.error_messages %> -
    - <%= f.label :context %> - <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :rows => 10, :cols => 40 %> - - <% end %> - <% end %> -
    - -
    -
    - -
    - <%= f.submit %> -
    +
    + +
    + <%= f.label :name %> + <%= @page_context.page.i18n_variable[I18n.locale] %> +
    + +
    + <%= f.label :context %> + <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> + <% @site_valid_locales.each do |locale| %> + + <%= I18nVariable.from_locale(locale) %> + <%= f.text_area locale, :style=>"width:100%" %> + + <% end %> + <% end %> +
    + + +
    + <%= f.submit 'Submit/', :class=>'btn btn-primary' %> +
    + +
    <% content_for :page_specific_javascript do %> diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb index c1d86fe1..08db9b2d 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb @@ -1,10 +1,14 @@ - - <%= page_context.page.i18n_variable[I18n.locale] %> - <%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %> - <%= page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %> - <%= User.find(page_context.create_user_id).name %> - - <%= link_to t('page_context.edit'), edit_panel_page_content_back_end_page_context_path(page_context) %> - - + + + <%= page_context.page.i18n_variable[I18n.locale] %> +
    +
      +
    • <%= link_to t('page_context.edit'), edit_panel_page_content_back_end_page_context_path(page_context) %>
      • +
    +
    + + <%= link_to page_context.version, panel_page_content_back_end_view_path(page_context.page_id) %> + <%= page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %> + <%= User.find(page_context.create_user_id).name %> + \ No newline at end of file diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb index db23a280..7035a700 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb @@ -1,10 +1,15 @@ - - <%= view_page_context.page.i18n_variable[I18n.locale] %> - <%= view_page_context.version %> - <%= view_page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %> - <%= User.find(view_page_context.create_user_id).name %> - - <%= link_to t('view_page_context.show'), panel_page_content_back_end_page_context_path(view_page_context) %> - - + + + + <%= view_page_context.page.i18n_variable[I18n.locale] %> +
    +
      +
    • <%= link_to t('view_page_context.show'), panel_page_content_back_end_page_context_path(view_page_context) %>
      • +
    +
    + + <%= view_page_context.version %> + <%= view_page_context.updated_at.strftime("%Y-%m-%d %H:%I:%S") %> + <%= User.find(view_page_context.create_user_id).name %> + \ No newline at end of file diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb index 18bb0ce5..86f2398c 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/edit.html.erb @@ -1,7 +1,3 @@ -
    -
    -
    -

    <%= t('page_content.editing_page_content') %>

    @@ -9,8 +5,4 @@ <%= render :partial => 'form', :locals => {:f => f} %> <% end %> -<%= link_back %> -
    -
    -
    -
    \ No newline at end of file +<%#= link_back %> \ No newline at end of file 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 a1566881..3227dcd4 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 @@ -1,36 +1,20 @@ -<% content_for :secondary do %> -
    -
    -
    -
    -
    -
      -
    • <%= link_to t('page_context.page_content_list'), panel_page_content_back_end_page_contexts_path %>
      • -
    -<% end -%> <%= flash_messages %> -
    -
    -
    -
    -
    - -

    <%= t('page_context.list_page_content') %>

    - - - - - - - - - +
    <%= t('page_context.name') %><%= t('page_context.version') %><%= t('page_context.update_time') %><%= t('page_context.last_modified') %><%= t('page_context.action') %>
    + + + + + + + + + - <%= render :partial => 'page_context', :collection => @page_contexts %> + <%= render :partial => 'page_context', :collection => @page_contexts %> -
    <%= t('page_context.name') %><%= t('page_context.version') %><%= t('page_context.update_time') %><%= t('page_context.last_modified') %>
    + + -
    diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb index c5a9871a..d88df80e 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/view.html.erb @@ -1,36 +1,19 @@ -<% content_for :secondary do %> -
    -
    -
    -
    -
    -
      -
    • <%= link_to t('page_context.page_content_list'), panel_page_content_back_end_page_contexts_path %>
      • -
    -<% end -%> <%= flash_messages %> -
    -
    -
    -
    -
    - -

    <%= t('page_context.list_page_content') %>

    - - - - - - - - - +
    <%= t('page_context.name') %><%= t('page_context.version') %><%= t('page_context.update_time') %><%= t('page_context.last_modified') %><%= t('page_context.action') %>
    + + + + + + + + + <%= render :partial => 'view_page_context', :collection => @page_contexts %> -
    <%= t('page_context.name') %><%= t('page_context.version') %><%= t('page_context.update_time') %><%= t('page_context.last_modified') %>
    - -
    + + diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb index 3db38add..0ba3236a 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb @@ -1,6 +1,6 @@ class Panel::WebResource::BackEnd::WebLinkCategorysController < ApplicationController - layout 'admin' + layout 'new_admin' def index @web_link_categorys = WebLinkCategory.all 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 f1ec7485..dfe09ce5 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 @@ -1,7 +1,7 @@ class Panel::WebResource::BackEnd::WebLinksController < ApplicationController - layout 'admin' + layout 'new_admin' before_filter :authenticate_user! before_filter :is_admin? diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb index 7eb698ea..2e0f61ff 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb @@ -1,25 +1,29 @@ <% # encoding: utf-8 %> <%= form_for(@web_link_category, :remote => true, :url => @url) do |f| %> -<%#= form_for(@web_link_category, :remote => true, :url => panel_web_resource_back_end_web_link_category_path(@web_link_category)) do |f| %> -
    - <%= f.label :key %>
    - <%= f.text_field :key %> -
    +

    <%= (@web_link_category.new_record? ? 'Add' : 'Edit') %>

    + +
    + <%= f.label :key %> + <%= f.text_field :key %> +
    + +
    + <%= f.fields_for :i18n_variable, (@web_link_category.new_record? ? @web_link_category.build_i18n_variable : @web_link_category.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> +
    + <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> +
    + <%= f.text_field locale, :class => 'input-xxlarge' %> +
    +
    + <% end %> + <% end %> +
    -
    - <%= f.label :name %>
    - <%= f.fields_for :i18n_variable, (@web_link_category.new_record? ? @web_link_category.build_i18n_variable : @web_link_category.i18n_variable) do |f| %> - <% @site_valid_locales.each do |locale| %> - <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> - <%= f.text_field locale, :style => "width:130px" %> - <% end %> - <% end %> -
    - -
    - <%= f.submit %> +
    + <%= f.submit 'Submit/', :class=>'btn btn-primary' %>
    <% end %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb index d6e27e8d..3f6a1a71 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb @@ -1,12 +1,16 @@ - - <%= web_link_category.key %> - <% @site_valid_locales.each do |locale| %> - <%= web_link_category.i18n_variable[locale] rescue nil %> - <% end %> - - <%= link_to t('web_link_category.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %> | - <%= link_to t('web_link_category.quick_edit'), panel_web_resource_back_end_web_link_category_quick_edit_path(web_link_category), :remote => true %> | - <%= link_to t('web_link_category.delete'), panel_web_resource_back_end_web_link_category_path(web_link_category), :confirm => t('sure?'), :method => :delete, :remote => true %> - - \ No newline at end of file + + + + <%= web_link_category.key %> +
    +
      +
    • <%= link_to t('web_link_category.edit'), edit_panel_web_resource_back_end_web_link_category_path(web_link_category), :remote => true %>
      • +
    • <%= link_to t('web_link_category.delete'), panel_web_resource_back_end_web_link_category_quick_edit_path(web_link_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
      • +
    +
    + + <% @site_valid_locales.each do |locale| %> + <%= web_link_category.i18n_variable[locale] rescue nil %> + <% end %> + \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb index 45842451..762da9e7 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/index.html.erb @@ -1,43 +1,23 @@ -<% content_for :secondary do %> -
    -
    -
    -
    -
    -
      -
    • <%#= link_to t('web_link_category.new_web_resource_class'), new_panel_web_resource_back_end_web_link_category_path, :class => 'seclink1' %>
      • -
    -<% end -%> + <%= flash_messages %> -

    <%= t('web_link_category.list_web_resource_class') %>

    -
    -
    -
    -
    -
    - - - - <% @site_valid_locales.each do |locale| %> - - <% end %> - - + + + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + + -<%# @web_link_categorys.each do |post| %> <%= render :partial => 'web_link_category', :collection => @web_link_categorys %> -<%# end %> + + -
    -
    -
    -
    - -

    Add New

    <%= render :partial => "form" %>
    - diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb index ce17555a..2abdf4a0 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb @@ -1,62 +1,101 @@ <% # encoding: utf-8 %> <%= f.error_messages %> - <%#= debugger %> - -
    - <%= f.label :category %>
    - <%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %> -
    - -
    - <%= f.label :name %> - <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale %> - - <% end %> - <% end %> -
    - -
    - <%= f.label :url %>
    - <%= f.text_field :url, :size => 60 %> -
    -
    - <%= f.label :describe %> - <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :rows => 10, :cols => 40 %> - - <% end %> - <% end %> -
    + + +
    + +
    +
    + +
    +

    Status

    +
    +
    + <%= f.check_box :is_top %><%= t('top') %> + <%= f.check_box :is_hot %><%= t('hot') %> + <%= f.check_box :is_hidden %><%= t('hide') %> +
    +
    +
    + +
    +
    + +
    +

    Tags

    +
    + <% @tags.each do |tag| %> + <%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%> + <%= tag[I18n.locale] %> + <% end %> +
    +
    -
    - <%= f.label :status %>
    - <%= f.check_box :is_top %><%= t('top') %> - <%= f.check_box :is_hot %><%= t('hot') %> - <%= f.check_box :is_hidden %><%= t('hidden') %> -
    - -
    - <%= f.label :tags %>
    - <% @tags.each do |tag| %> - <%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%> - <%= tag[I18n.locale] %> - <% end %> -
    - -
    -
    +
    -
    - <%= f.submit %> + + + +
    +
    + + <%= f.label :category %> + <%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %> + +
    + + English + + + +
    + +
    + <%= f.label :name %> + <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %> + <% @site_valid_locales.each do |locale| %> + + <%= I18nVariable.from_locale(locale) %> + <%= f.text_field locale, :class=>'post-title' %> + + <% end %> + <% end %> +
    + +
    + <%= f.label :url %> + <%= f.text_field :url %> +
    + +
    + <%= f.label :describe %> + <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %> + <% @site_valid_locales.each do |locale| %> + + <%= I18nVariable.from_locale(locale) %> + <%= f.text_area locale, :style=>"width:100%" %> + + <% end %> + <% end %> +
    + +
    + + + + +
    + <%= f.submit 'Submit/', :class=>'btn btn-primary' %>
    \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb index d87b59d8..c58f15e4 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_links.html.erb @@ -1,5 +1,5 @@ - + <% if post.is_top? %> <%= t(:top) %> @@ -10,6 +10,12 @@ <% if post.is_hidden? %> <%= t(:hidden) %> <% end %> +
    +
      +
    • <%= link_to t('web_link.edit'), edit_panel_web_resource_back_end_web_link_path(post) %>
      • +
    • <%= link_to t('web_link.delete'), panel_web_resource_back_end_web_link_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %>
      • +
    +
    <%= post.web_link_category.i18n_variable[I18n.locale] %> @@ -20,12 +26,5 @@ <%= tag[I18n.locale] %> <% end %> - - <%= link_to t('web_link.edit'), edit_panel_web_resource_back_end_web_link_path(post) %> | - - <%= link_to t(:set_top), eval("panel_web_resource_back_end_web_link_path(post, :authenticity_token => form_authenticity_token, :web_link => {:is_top => true})"), :remote => true, :method => :put, :id => "disable_#{post.id}", :style => "display:#{post.is_top? ? 'none' : ''}", :class => 'switch' %> - <%= link_to t(:cancel_top), eval("panel_web_resource_back_end_web_link_path(post, :authenticity_token => form_authenticity_token, :web_link => {:is_top => false})"), :remote => true, :method => :put, :id => "enable_#{post.id}", :style => "display:#{post.is_top? ? '' : 'none'}", :class => 'switch' %> - - | <%= link_to t('web_link.delete'), panel_web_resource_back_end_web_link_path(post), :confirm => t('sure?'), :method => :delete, :remote => true %> - + 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 82afe4ea..301c1bbe 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 @@ -1,52 +1,21 @@ -<% content_for :secondary do %> -
    -
    -
    -
    -
    -
      -
    • <%= link_to t('web_link.new_link'), new_panel_web_resource_back_end_web_link_path %>
      • -
    • <%= link_to t('web_link.link_list'), panel_web_resource_back_end_web_links_path %>
      • -
    • <%= link_to t('web_link.new_link_class'), panel_web_resource_back_end_web_link_categorys_path %>
      • -
    -<% end -%> <%= flash_messages %> -
    -
    -
    -
    -
    - - <%= form_for :web_link, :action => 'search', :method => 'get', :url => panel_web_resource_back_end_web_links_path do |f| %> - - <%#= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ] },{ :include_blank => t('web_link.select') }%> - - Category <%= select_tag "category_id", options_for_select(@web_link_categorys.collect{|t| [t.i18n_variable[I18n.locale], t.id]}), :prompt => t('web_link.select') %> - - <%= submit_tag "OK", :name => nil %> - - <% end %> - -
    -
    - -

    <%= t('web_link.list_link') %>

    - - - - - - - - - +
    <%= t('web_link.status') %><%= t('web_link.category') %><%= t('web_link.name') %><%= t('web_link.tags') %><%= t('web_link.action') %>
    + + + + + + + + + <% @web_links.each do |post| %> <%= render :partial => 'web_links', :locals => {:post => post} %> - <% end %> -
    <%= t('web_link.status') %><%= t('web_link.category') %><%= t('web_link.name') %><%= t('web_link.tags') %>
    - -
    + <% end %> + + + From f4fda08e865b1672d5bb4284e32cafdce527f014 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 5 Mar 2012 16:19:08 +0800 Subject: [PATCH 013/125] Replace PrototypeR4 by Orbit. Move session into mongoid_store. Reset session when sing_in. --- Gemfile | 3 ++ Gemfile.lock | 32 +++++++++++++++++++ Rakefile | 2 +- app/controllers/admin/sessions_controller.rb | 8 +++++ app/models/session.rb | 12 +++++++ config.ru | 2 +- config/application.rb | 3 +- config/environment.rb | 2 +- config/environments/development.rb | 2 +- config/environments/production.rb | 2 +- config/environments/test.rb | 2 +- .../cookie_verification_secret.rb | 2 +- config/initializers/secret_token.rb | 2 +- config/initializers/session_store.rb | 7 +--- config/routes.rb | 2 +- .../config/initializers/app_config.rb | 4 +-- 16 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 app/controllers/admin/sessions_controller.rb create mode 100644 app/models/session.rb diff --git a/Gemfile b/Gemfile index eb1f5434..cd8c36f9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,8 @@ source 'http://rubygems.org' gem 'rails', '>=3.1.0', '<3.2.0' +gem "brakeman" + gem 'bson_ext' gem 'carrierwave' gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid' @@ -13,6 +15,7 @@ gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git' gem 'mini_magick' gem 'mongoid' +gem "mongo_session_store-rails3" gem 'radius' gem 'rake' gem 'ruby-debug19' diff --git a/Gemfile.lock b/Gemfile.lock index 8889b1d5..b1ab1679 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,6 +42,14 @@ GEM arel (2.2.1) bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-x86-mingw32) + brakeman (1.5.0) + activesupport + erubis (~> 2.6) + haml (~> 3.0) + i18n + ruby2ruby (~> 1.2) + ruport (~> 1.6) + sass (~> 3.0) bson (1.5.2) bson_ext (1.5.2) bson (= 1.5.2) @@ -59,6 +67,7 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) + color (1.4.1) columnize (0.3.6) database_cleaner (0.7.1) delorean (1.2.0) @@ -78,7 +87,11 @@ GEM factory_girl_rails (1.6.0) factory_girl (~> 2.5.0) railties (>= 3.0.0) + fastercsv (1.5.4) + haml (3.1.4) hike (1.2.1) + hoe (2.15.0) + rake (~> 0.8) i18n (0.6.0) jquery-rails (1.0.19) railties (~> 3.0) @@ -96,12 +109,18 @@ GEM subexec (~> 0.2.1) mongo (1.5.2) bson (= 1.5.2) + mongo_session_store-rails3 (3.0.5) + actionpack (>= 3.0) + mongo mongoid (2.4.2) activemodel (~> 3.1) mongo (~> 1.3) tzinfo (~> 0.3.22) multi_json (1.0.4) orm_adapter (0.0.6) + pdf-writer (1.1.8) + color (>= 1.4.0) + transaction-simple (~> 1.3) polyglot (0.3.3) rack (1.3.6) rack-cache (1.1) @@ -154,15 +173,24 @@ GEM columnize (>= 0.3.1) linecache19 (>= 0.5.11) ruby-debug-base19 (>= 0.11.19) + ruby2ruby (1.3.1) + ruby_parser (~> 2.0) + sexp_processor (~> 3.0) ruby_core_source (0.1.5) archive-tar-minitar (>= 0.5.2) + ruby_parser (2.3.1) + sexp_processor (~> 3.0) rubyzip (0.9.5) + ruport (1.6.3) + fastercsv + pdf-writer (= 1.1.8) sass (3.1.12) sass-rails (3.1.5) actionpack (~> 3.1.0) railties (~> 3.1.0) sass (~> 3.1.10) tilt (~> 1.3.2) + sexp_processor (3.1.0) shoulda-matchers (1.0.0) simplecov (0.5.4) multi_json (~> 1.0.3) @@ -186,6 +214,8 @@ GEM tilt (1.3.3) tinymce-rails (3.4.8) railties (>= 3.1) + transaction-simple (1.4.0) + hoe (>= 1.1.7) treetop (1.4.10) polyglot polyglot (>= 0.3.1) @@ -210,6 +240,7 @@ PLATFORMS x86-mingw32 DEPENDENCIES + brakeman bson_ext carrierwave carrierwave-mongoid @@ -223,6 +254,7 @@ DEPENDENCIES jquery-rails kaminari! mini_magick + mongo_session_store-rails3 mongoid radius rails (>= 3.1.0, < 3.2.0) diff --git a/Rakefile b/Rakefile index 2036d04c..9a495de7 100644 --- a/Rakefile +++ b/Rakefile @@ -5,4 +5,4 @@ require File.expand_path('../config/application', __FILE__) require 'rake/dsl_definition' require 'rake' -PrototypeR4::Application.load_tasks +Orbit::Application.load_tasks diff --git a/app/controllers/admin/sessions_controller.rb b/app/controllers/admin/sessions_controller.rb new file mode 100644 index 00000000..00649580 --- /dev/null +++ b/app/controllers/admin/sessions_controller.rb @@ -0,0 +1,8 @@ +class SessionsController < Devise::SessionsController + + def create + super + reset_session + end + +end \ No newline at end of file diff --git a/app/models/session.rb b/app/models/session.rb new file mode 100644 index 00000000..3c6deb54 --- /dev/null +++ b/app/models/session.rb @@ -0,0 +1,12 @@ +class Session + include Mongoid::Document + include Mongoid::Timestamps + + def self.sweep(time = 1.hour) + if time.is_a?(String) + time = time.split.inject { |count, unit| count.to_i.send(unit) } + end + + delete_all "updated_at < '#{time.ago.to_s(:db)}' OR created_at < '#{2.days.ago.to_s(:db)}'" + end +end \ No newline at end of file diff --git a/config.ru b/config.ru index 20d6bd1f..6a593e4a 100644 --- a/config.ru +++ b/config.ru @@ -1,4 +1,4 @@ # This file is used by Rack-based servers to start the application. require ::File.expand_path('../config/environment', __FILE__) -run PrototypeR4::Application +run Orbit::Application diff --git a/config/application.rb b/config/application.rb index 50b9f4a7..d1243133 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,12 +13,13 @@ require 'sprockets/railtie' # or test environments. Bundler.require *Rails.groups(:assets) if defined?(Bundler) -module PrototypeR4 +module Orbit class Application < Rails::Application # Add directories for plugins config.paths["vendor/plugins"] += %W(#{config.root}/vendor/built_in_modules) config.paths["vendor/plugins"] += %W(#{config.root}/vendor/downloaded_modules) + config.paths.app.views << "app/views/devise" # Settings in config/environments/* take precedence over those specified here. diff --git a/config/environment.rb b/config/environment.rb index efd38a40..3538bc87 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -4,4 +4,4 @@ require 'yaml' YAML::ENGINE.yamler = 'syck' # Initialize the rails application -PrototypeR4::Application.initialize! +Orbit::Application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb index c2b4c930..1dbff032 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,4 +1,4 @@ -PrototypeR4::Application.configure do +Orbit::Application.configure do # Settings specified here will take precedence over those in config/application.rb # In the development environment your application's code is reloaded on diff --git a/config/environments/production.rb b/config/environments/production.rb index f52ead13..001ff2c6 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,4 +1,4 @@ -PrototypeR4::Application.configure do +Orbit::Application.configure do # Settings specified here will take precedence over those in config/application.rb # The production environment is meant for finished, "live" apps. diff --git a/config/environments/test.rb b/config/environments/test.rb index 6d22bb12..e55cc24b 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,4 +1,4 @@ -PrototypeR4::Application.configure do +Orbit::Application.configure do # Settings specified here will take precedence over those in config/application.rb # The test environment is used exclusively to run your application's diff --git a/config/initializers/cookie_verification_secret.rb b/config/initializers/cookie_verification_secret.rb index 5a8601a7..694e666d 100644 --- a/config/initializers/cookie_verification_secret.rb +++ b/config/initializers/cookie_verification_secret.rb @@ -4,4 +4,4 @@ # If you change this key, all old signed cookies will become invalid! # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. -PrototypeR4::Application.config.secret_token = 'cbf6409102b30cb9f4da455ee08c3a7e9d8b2a3d32a0e5b59a354dad03f469d363a8127ef4b7bc3b1afa632d7cf947a1e59e09022d2d4cd8df1f4fa521d7ec07' +Orbit::Application.config.secret_token = 'cbf6409102b30cb9f4da455ee08c3a7e9d8b2a3d32a0e5b59a354dad03f469d363a8127ef4b7bc3b1afa632d7cf947a1e59e09022d2d4cd8df1f4fa521d7ec07' diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 67abf723..ae9a444a 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -4,4 +4,4 @@ # If you change this key, all old signed cookies will become invalid! # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. -PrototypeR4::Application.config.secret_token = 'b8d78ecaf3086ebfc1ba42e912acba60d85cf3d789d933e117770e1a045a12911f121ff012a234982abb446c8b8c768052eea4bf8b2d5d336be821e2c25d8cdb' +Orbit::Application.config.secret_token = 'b8d78ecaf3086ebfc1ba42e912acba60d85cf3d789d933e117770e1a045a12911f121ff012a234982abb446c8b8c768052eea4bf8b2d5d336be821e2c25d8cdb' diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index e6387adb..b1a4a2c1 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,8 +1,3 @@ # Be sure to restart your server when you modify this file. -PrototypeR4::Application.config.session_store :cookie_store, :key => '_prototype_R4_session' - -# Use the database for sessions instead of the cookie-based default, -# which shouldn't be used to store highly confidential information -# (create the session table with "rails generate session_migration") -# PrototypeR4::Application.config.session_store :active_record_store +Orbit::Application.config.session_store :mongoid_store diff --git a/config/routes.rb b/config/routes.rb index cd3921f0..112d96e1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ -PrototypeR4::Application.routes.draw do +Orbit::Application.routes.draw do devise_for :users diff --git a/vendor/built_in_modules/new_blog/config/initializers/app_config.rb b/vendor/built_in_modules/new_blog/config/initializers/app_config.rb index c098b837..0e9f56e7 100644 --- a/vendor/built_in_modules/new_blog/config/initializers/app_config.rb +++ b/vendor/built_in_modules/new_blog/config/initializers/app_config.rb @@ -3,7 +3,7 @@ # # Add a load path for this specific Engine # # config.autoload_paths << File.expand_path("../lib/some/path", __FILE__) # put "ABC" -# PrototypeR4::Application::Orbit_Apps << "NewBlog" +# Orbit::Application::Orbit_Apps << "NewBlog" # # # initializer "my_engine.add_middleware" do |app| # # app.middleware.use MyEngine::Middleware @@ -15,4 +15,4 @@ module NewBlog VERSION = "0.0.1" MOUDLEAPP_TITLE = "NewBlog" end -# PrototypeR4::Application::Orbit_Apps << "NewBlog" \ No newline at end of file +# Orbit::Application::Orbit_Apps << "NewBlog" \ No newline at end of file From 29ec36130e660318f8fbc86208e5952011413aac Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Fri, 16 Mar 2012 15:06:45 +0800 Subject: [PATCH 014/125] css and js changes --- app/assets/javascripts/orbit-1.0.js | 9 +- app/assets/stylesheets/site_items.css.erb | 963 +++++++++++----------- 2 files changed, 488 insertions(+), 484 deletions(-) diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index efb7042e..f8daaecd 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -52,12 +52,15 @@ $(document).ready(function(){ /*tinyscrollbar&windows-Size*/ resize(); - $('#main-sidebar').css("height", viewportheight-40); - $('#main-sidebar .viewport').css("height", viewportheight-40); + var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2; + $('#main-sidebar').css("height", viewportheight-30); + $('#main-sidebar .viewport').css("height", viewportheight-30); $('.post-title').css("width", viewportwidth-495); + $('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft) $('#main-sidebar').tinyscrollbar(); $('.detal-list').tinyscrollbar(); - $('#main-sidebar').tinyscrollbar({size:(viewportheight-44)}); + $('#main-sidebar').tinyscrollbar({size:(viewportheight-34)}); + mainTablePosition() /*isotope*/ var $container = $('#isotope'); diff --git a/app/assets/stylesheets/site_items.css.erb b/app/assets/stylesheets/site_items.css.erb index 38b0a185..4e23bd4c 100644 --- a/app/assets/stylesheets/site_items.css.erb +++ b/app/assets/stylesheets/site_items.css.erb @@ -1,482 +1,483 @@ -html, body{ - height: 100%; - margin: 0; - padding: 0; -} -html{ - background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent; - background-size: cover; -} - -body{ - color: #000000; - font-family: Helvetica, '敺株甇暺擃'; -} -#back_banner_link{ - background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #787e82), color-stop(0.05, #61676c), color-stop(1, #292c2d) ); - background:-moz-linear-gradient( center top -90deg, #787e82 0%, #61676c 5%, #292c2d 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61676c', endColorstr='#292c2d'); - -moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7); - -webkit-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7); - box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7); - border-top: 1px solid #474a4c; - border-bottom: 1px solid #1d2020; - height: 41px; - width: 100%; - behavior: url(<%= asset_path "PIE.htc" %>); -} -.hmenu{ - float: right; - height: 41px; -} -#back_orbit{ - background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #70787d), color-stop(1, #3b4043) ); - background:-moz-linear-gradient( center top -90deg, #70787d 0%, #3b4043 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#70787d', endColorstr='#3b4043'); - -webkit-border-radius: 0px 0px 5px 5px; - -moz-border-radius: 0px 0px 5px 5px; - border-radius: 0px 0px 5px 5px; - -moz-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7); - -webkit-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7); - box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7); - cursor: pointer; - float: left; - height: 43px; - margin-left: 10px; - width: 41px; - behavior: url(<%= asset_path "PIE.htc" %>); -} -#back_orbit span{ - text-indent: -9999px; - background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent; - display: block; - height: 43px; - width: 100%; -} -#back_orbit:hover{ - background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #fefefe), color-stop(1, #e4e4e4) ); - background:-moz-linear-gradient( center top -90deg, #fefefe 0%, #e4e4e4 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#e4e4e4'); - -webkit-border-radius: 0px; - -moz-border-radius: 0px; - border-radius: 0px; -} -#back_orbit:hover span{ - background-position: 0 -44px; -} -#back_orbit:hover #orblist{ - display:block; -} -#orblist{ - background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #e4e4e4), color-stop(1, #FFFFFF) ); - background:-moz-linear-gradient( center top -90deg, #e4e4e4 0%, #FFFFFF 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e4e4e4', endColorstr='#FFFFFF'); - -webkit-border-radius: 0px 3px 3px 3px; - -moz-border-radius: 0px 3px 3px 3px; - border-radius: 0px 3px 3px 3px; - -webkit-box-shadow: 0 3px 3px #000000; - -moz-box-shadow: 0 3px 3px #000000; - box-shadow: 0 3px 3px #000000; - display: none; - margin: 0; - padding: 10px; - position: absolute; - top: 43px; - width: 130px; -} -#orblist li{ - border-bottom:1px solid #aaa; - list-style:none; -} -.orblink{ - color: #333333; - display: block; - font: 12px/100% arial,sans-serif; - padding: 5px; - text-decoration: none; -} -.orblink:hover{ - background:#eee; - color:#333; -} -#log_out{ - -moz-box-shadow:inset 1px 0px 0px 0px #73777b; - -webkit-box-shadow:inset 1px 0px 0px 0px #73777b; - box-shadow:inset 1px 0px 0px 0px #73777b; - border-right:1px solid #41474c; - border-left:1px solid #41474c; - float:right; - width:41px; - height:41px; -} -#log_out:hover{ - background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #01afde), color-stop(1, #007ec6) ); - background:-moz-linear-gradient( center top -90deg, #01afde 0%, #007ec6 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#01afde', endColorstr='#007ec6'); -} -#log_out a{ - background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent; - display: block; - height: 41px; - text-indent: -9999px; - width: 41px; -} -#log_out a:hover{ - background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important; -} -.lang{ - color: #FFFFFF; - float: right; - font-size: 15px; - line-height: 40px; - margin-right: 10px; -} -.lang a{ - color:#fff; - text-decoration:none; -} -.lang a:hover{ - text-decoration:underline; -} -#back_content{ - height: 100%; -} -#back_footer{ - background-color: #101010; - bottom: 0; - color: #FFFFFF; - font-size: 11px; - padding: 10px; - position: fixed; - width: 100%; - left: 0; - box-shadow: 0 -3px 4px #000; -} -.items_setup{ - padding:42px 0 0 0; -} -#back_sidebar .items_setup .list li{ - padding: 6px 0 7px 5px; -} -#back_sidebar .items_setup .list li a{ - display: inline; - font-size: 0.9em; - padding: 0; -} -#back_sidebar .items_setup .list li a span{ - background:none; - padding:0; - text-shadow:none; -} -.main { - background: none repeat scroll 0 0 #FFFFFF; - height: 100%; - margin-left: 220px; - padding: 0 40px; - position: relative; -} -.main_list { - padding-top: 70px; -} -.main_list ul { - clear:both; -} -#porfile { - padding-top: 100px; -} -/*add_buttom*/ -.button_bar { - float: right; - -moz-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; - -webkit-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; - box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #4f4f4f), color-stop(1, #000000) ); - background:-moz-linear-gradient( center top, #4f4f4f 5%, #000000 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4f4f4f', endColorstr='#000000'); - background-color:#4f4f4f; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - display:inline-block; - padding:0; - margin:10px 0 60px; -} -.button_bar a { - text-decoration:none; - text-shadow:0px -1px 0px #000000; - font-size:12px; - color:#EDEDED; - border-right:1px solid #555; - -moz-box-shadow:1px 0px 0px black; - -webkit-box-shadow:1px 0px 0px black; - box-shadow:1px 0px 0px black; - padding: 6px 10px 4px; - display: inline-block; - float: left; -} -.button_bar a:active { - padding: 7px 10px 3px !important; - text-shadow:0px 1px 0px #000000; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) ); - background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f'); -} -.button_bar a:last-child { - border-right:none; - -moz-box-shadow:none; - -webkit-box-shadow:none; - box-shadow:none; - -moz-border-radius:0px 5px 5px 0px; - -webkit-border-radius:0px 5px 5px 0px; - border-radius:0px 5px 5px 0px; -} -.button_bar a:first-child { - -moz-border-radius:5px 0px 0px 5px; - -webkit-border-radius:5px 0px 0px 5px; - border-radius:5px 0px 0px 5px; -} -.button_bar a.new { - padding: 5px 10px; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; -} -.button_bar a:hover { - color:#FFFFFF; -} -.up { - margin:10px 0; -} -#person { - left: 245px; - position: fixed; - text-align: center; - top: 75px; - width: 140px; - background-color:#FFF; - padding:15px; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */ - -webkit-box-shadow: 0px 0px 4px #180902;/* Safari Chrome */ - box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ -} -#file { - display:none; -} -#person img { -} -.user_mail { - border: medium none; - border:1px solid #DDDDDD; - color: #666666; - font-size: 12px; - width: 140px; -} -#person label { - display: block; - margin: 15px 0 0; -} -#person label input { -} -#person label #user_admin { - float:right; - margin: 0; -} -#person label span { - text-align:left; - font-size:11px; - color:#888; - display:block; -} -#person select { - border: 1px solid #DDDDDD; - padding: 0; - width: 140px; -} -#porfile .users{ - margin-left: 180px; -} -.roles_block { - background: url(<%= asset_path "75.png" %>) repeat left top; - min-width:710px; - margin-bottom:50px; - position:relative; - padding-bottom: 20px; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */ - -webkit-box-shadow: 0px 0px 4px #180902;/* Safari Chrome */ - box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ -} -.roles_block h2 { - color: #FFFFFF; - font-weight: normal; - margin: 0; - padding: 0; - position: absolute; - text-shadow: 0 3px 2px #000000; - top: -30px; -} -.main hr { - height:8px; - border:none; - margin:0; - border-radius: 5px 5px 0px 0px; - -moz-border-radius: 5px 5px 0px 0px; - -webkit-border-radius: 5px 5px 0px 0px; - border-bottom:1px solid #000; -} -.main2{ - padding:70px 0 0; -} -#basic_block hr { - background-color: #666666; -} -#teacher_block hr { - background-color: #0071A9; -} -#student_block hr { - background-color: #AF0045; -} -.info_input { - padding:10px 20px; -} -.info_input table { - color:#fff; - width:100%; - font-size:14px; -} -.info_input table td { - padding:5px 10px 5px 0; - width: 10%; -} -.info_input .list_head { - background:url(<%= asset_path "line.png" %>) left bottom repeat-x; -} -.info_input .list_head td { -} -.info_input .list_item { - color:#AEAEAE; -} -.info_input .add { - display:block; - padding-left:22px; - font-size:12px; - line-height:21px; - height:19px; - background:url(<%= asset_path "icon.png" %>) no-repeat -59px 0; - margin-top: 10px; - color: #DDDDDD; -} - -.main table { - width:100%; -} -.main td { - padding-left:20px; - color:#fff; - font-size:14px; - line-height:40px; -} -.main tr.have td{ - background: url(<%= asset_path "75.png" %>) repeat left top; -} -.main tr.have td:first-child{ - border-radius: 5px 0 0 5px; - -moz-border-radius: 5px 0 0 5px; - -webkit-border-radius: 5px 0 0 5px; -} -.main tr.have td:last-child{ - border-radius: 0 5px 5px 0; - -moz-border-radius: 0 5px 5px 0; - -webkit-border-radius: 0 5px 5px 0; -} -.main thead td { - line-height:40px; - font-size:16px; - text-shadow: 0px 1px 1px #3e2914; -} -.main thead td.action { - width:140px; -} -.main tbody td.roles { - background-image: url(<%= asset_path "roles_type.jpg" %>); - background-repeat: repeat-x; -} -.main tbody td.teacher { - background-position: 0 -54px; -} -.main tbody td.student { - background-position: 0 -5px; -} -.main tbody td.action a { - background-image: url(<%= asset_path "icon.png" %>); - display: inline-block; - height: 19px; - margin-right: 10px; - top: 8px; - text-indent: -9999px; - width: 19px; - position: relative; -} -.main tbody td.action a.show { - background-position: left top; -} -.main tbody td.action a.show:hover { - background-position: left -19px; -} -.main tbody td.action a.edit { - background-position: -19px top; -} -.main tbody td.action a.edit:hover { - background-position: -19px -19px; -} -.main tbody td.action a.delete { - background-position: -38px top; -} -.main tbody td.action a.delete:hover { - background-position: -38px -19px; -} -.main tbody td.action a.switch { - background: url(<%= asset_path "switch.png" %>) no-repeat left 3px; - width: 40px; -} -.main tbody tr.disable td.action a.switch { - background-position:left bottom; -} -.main tbody td.action a.delete:hover { - background-position: -38px -19px; -} -.main tbody tr.have { -} -.main tbody tr.disable { - opacity: 0.7; -} -.main tbody tr { - background:none; - height:15px; -} -h1{ - margin:0 0 20px; -} -p{ - margin:0 0 10px; -} - -#back_sidebar .items_setup .list li{ - background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top; - border:none; - padding: 0 0 0 5px; -} -#back_sidebar .items_setup .list li a{ - line-height:31px; -} -#back_sidebar .items_setup .list li:hover{ - background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top; - border:none; -} -#back_sidebar .items_setup ul .list { +html, body{ + height: 100%; + margin: 0; + padding: 0; +} +html{ + background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent; + background-size: cover; +} + +body{ + color: #000000; + font-family: Helvetica, '敺株甇暺擃'; +} +#back_banner_link{ + background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #787e82), color-stop(0.05, #61676c), color-stop(1, #292c2d) ); + background:-moz-linear-gradient( center top -90deg, #787e82 0%, #61676c 5%, #292c2d 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61676c', endColorstr='#292c2d'); + -moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7); + -webkit-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7); + box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7); + border-top: 1px solid #474a4c; + border-bottom: 1px solid #1d2020; + height: 41px; + width: 100%; + behavior: url(<%= asset_path "PIE.htc" %>); +} +.hmenu{ + float: right; + height: 41px; +} +#back_orbit{ + background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #70787d), color-stop(1, #3b4043) ); + background:-moz-linear-gradient( center top -90deg, #70787d 0%, #3b4043 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#70787d', endColorstr='#3b4043'); + -webkit-border-radius: 0px 0px 5px 5px; + -moz-border-radius: 0px 0px 5px 5px; + border-radius: 0px 0px 5px 5px; + -moz-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7); + -webkit-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7); + box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7); + cursor: pointer; + float: left; + height: 43px; + margin-left: 10px; + width: 41px; + behavior: url(<%= asset_path "PIE.htc" %>); +} +#back_orbit span{ + text-indent: -9999px; + background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent; + display: block; + height: 43px; + width: 100%; +} +#back_orbit:hover{ + background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #fefefe), color-stop(1, #e4e4e4) ); + background:-moz-linear-gradient( center top -90deg, #fefefe 0%, #e4e4e4 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#e4e4e4'); + -webkit-border-radius: 0px; + -moz-border-radius: 0px; + border-radius: 0px; +} +#back_orbit:hover span{ + background-position: 0 -44px; +} +#back_orbit:hover #orblist{ + display:block; +} +#orblist{ + background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #e4e4e4), color-stop(1, #FFFFFF) ); + background:-moz-linear-gradient( center top -90deg, #e4e4e4 0%, #FFFFFF 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e4e4e4', endColorstr='#FFFFFF'); + -webkit-border-radius: 0px 3px 3px 3px; + -moz-border-radius: 0px 3px 3px 3px; + border-radius: 0px 3px 3px 3px; + -webkit-box-shadow: 0 3px 3px #000000; + -moz-box-shadow: 0 3px 3px #000000; + box-shadow: 0 3px 3px #000000; + display: none; + margin: 0; + padding: 10px; + position: absolute; + top: 43px; + width: 130px; +} +#orblist li{ + border-bottom:1px solid #aaa; + list-style:none; +} +.orblink{ + color: #333333; + display: block; + font: 12px/100% arial,sans-serif; + padding: 5px; + text-decoration: none; +} +.orblink:hover{ + background:#eee; + color:#333; +} +#log_out{ + -moz-box-shadow:inset 1px 0px 0px 0px #73777b; + -webkit-box-shadow:inset 1px 0px 0px 0px #73777b; + box-shadow:inset 1px 0px 0px 0px #73777b; + border-right:1px solid #41474c; + border-left:1px solid #41474c; + float:right; + width:41px; + height:41px; +} +#log_out:hover{ + background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #01afde), color-stop(1, #007ec6) ); + background:-moz-linear-gradient( center top -90deg, #01afde 0%, #007ec6 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#01afde', endColorstr='#007ec6'); +} +#log_out a{ + background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent; + display: block; + height: 41px; + text-indent: -9999px; + width: 41px; +} +#log_out a:hover{ + background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important; +} +.lang{ + color: #FFFFFF; + float: right; + font-size: 15px; + line-height: 40px; + margin-right: 10px; +} +.lang a{ + color:#fff; + text-decoration:none; +} +.lang a:hover{ + text-decoration:underline; +} +#back_content{ + height: 100%; +} +#back_footer{ + background-color: #101010; + bottom: 0; + color: #FFFFFF; + display:none; + font-size: 11px; + padding: 10px; + position: fixed; + width: 100%; + left: 0; + box-shadow: 0 -3px 4px #000; +} +.items_setup{ + padding:42px 0 0 0; +} +#back_sidebar .items_setup .list li{ + padding: 6px 0 7px 5px; +} +#back_sidebar .items_setup .list li a{ + display: inline; + font-size: 0.9em; + padding: 0; +} +#back_sidebar .items_setup .list li a span{ + background:none; + padding:0; + text-shadow:none; +} +.main { + background: none repeat scroll 0 0 #FFFFFF; + height: 100%; + margin-left: 220px; + padding: 0 40px; + position: relative; +} +.main_list { + padding-top: 70px; +} +.main_list ul { + clear:both; +} +#porfile { + padding-top: 100px; +} +/*add_buttom*/ +.button_bar { + float: right; + -moz-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; + -webkit-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; + box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #4f4f4f), color-stop(1, #000000) ); + background:-moz-linear-gradient( center top, #4f4f4f 5%, #000000 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4f4f4f', endColorstr='#000000'); + background-color:#4f4f4f; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; + display:inline-block; + padding:0; + margin:10px 0 60px; +} +.button_bar a { + text-decoration:none; + text-shadow:0px -1px 0px #000000; + font-size:12px; + color:#EDEDED; + border-right:1px solid #555; + -moz-box-shadow:1px 0px 0px black; + -webkit-box-shadow:1px 0px 0px black; + box-shadow:1px 0px 0px black; + padding: 6px 10px 4px; + display: inline-block; + float: left; +} +.button_bar a:active { + padding: 7px 10px 3px !important; + text-shadow:0px 1px 0px #000000; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) ); + background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f'); +} +.button_bar a:last-child { + border-right:none; + -moz-box-shadow:none; + -webkit-box-shadow:none; + box-shadow:none; + -moz-border-radius:0px 5px 5px 0px; + -webkit-border-radius:0px 5px 5px 0px; + border-radius:0px 5px 5px 0px; +} +.button_bar a:first-child { + -moz-border-radius:5px 0px 0px 5px; + -webkit-border-radius:5px 0px 0px 5px; + border-radius:5px 0px 0px 5px; +} +.button_bar a.new { + padding: 5px 10px; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; +} +.button_bar a:hover { + color:#FFFFFF; +} +.up { + margin:10px 0; +} +#person { + left: 245px; + position: fixed; + text-align: center; + top: 75px; + width: 140px; + background-color:#FFF; + padding:15px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */ + -webkit-box-shadow: 0px 0px 4px #180902;/* Safari Chrome */ + box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ +} +#file { + display:none; +} +#person img { +} +.user_mail { + border: medium none; + border:1px solid #DDDDDD; + color: #666666; + font-size: 12px; + width: 140px; +} +#person label { + display: block; + margin: 15px 0 0; +} +#person label input { +} +#person label #user_admin { + float:right; + margin: 0; +} +#person label span { + text-align:left; + font-size:11px; + color:#888; + display:block; +} +#person select { + border: 1px solid #DDDDDD; + padding: 0; + width: 140px; +} +#porfile .users{ + margin-left: 180px; +} +.roles_block { + background: url(<%= asset_path "75.png" %>) repeat left top; + min-width:710px; + margin-bottom:50px; + position:relative; + padding-bottom: 20px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */ + -webkit-box-shadow: 0px 0px 4px #180902;/* Safari Chrome */ + box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ +} +.roles_block h2 { + color: #FFFFFF; + font-weight: normal; + margin: 0; + padding: 0; + position: absolute; + text-shadow: 0 3px 2px #000000; + top: -30px; +} +.main hr { + height:8px; + border:none; + margin:0; + border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px; + -webkit-border-radius: 5px 5px 0px 0px; + border-bottom:1px solid #000; +} +.main2{ + padding:70px 0 0; +} +#basic_block hr { + background-color: #666666; +} +#teacher_block hr { + background-color: #0071A9; +} +#student_block hr { + background-color: #AF0045; +} +.info_input { + padding:10px 20px; +} +.info_input table { + color:#fff; + width:100%; + font-size:14px; +} +.info_input table td { + padding:5px 10px 5px 0; + width: 10%; +} +.info_input .list_head { + background:url(<%= asset_path "line.png" %>) left bottom repeat-x; +} +.info_input .list_head td { +} +.info_input .list_item { + color:#AEAEAE; +} +.info_input .add { + display:block; + padding-left:22px; + font-size:12px; + line-height:21px; + height:19px; + background:url(<%= asset_path "icon.png" %>) no-repeat -59px 0; + margin-top: 10px; + color: #DDDDDD; +} + +.main table { + width:100%; +} +.main td { + padding-left:20px; + color:#fff; + font-size:14px; + line-height:40px; +} +.main tr.have td{ + background: url(<%= asset_path "75.png" %>) repeat left top; +} +.main tr.have td:first-child{ + border-radius: 5px 0 0 5px; + -moz-border-radius: 5px 0 0 5px; + -webkit-border-radius: 5px 0 0 5px; +} +.main tr.have td:last-child{ + border-radius: 0 5px 5px 0; + -moz-border-radius: 0 5px 5px 0; + -webkit-border-radius: 0 5px 5px 0; +} +.main thead td { + line-height:40px; + font-size:16px; + text-shadow: 0px 1px 1px #3e2914; +} +.main thead td.action { + width:140px; +} +.main tbody td.roles { + background-image: url(<%= asset_path "roles_type.jpg" %>); + background-repeat: repeat-x; +} +.main tbody td.teacher { + background-position: 0 -54px; +} +.main tbody td.student { + background-position: 0 -5px; +} +.main tbody td.action a { + background-image: url(<%= asset_path "icon.png" %>); + display: inline-block; + height: 19px; + margin-right: 10px; + top: 8px; + text-indent: -9999px; + width: 19px; + position: relative; +} +.main tbody td.action a.show { + background-position: left top; +} +.main tbody td.action a.show:hover { + background-position: left -19px; +} +.main tbody td.action a.edit { + background-position: -19px top; +} +.main tbody td.action a.edit:hover { + background-position: -19px -19px; +} +.main tbody td.action a.delete { + background-position: -38px top; +} +.main tbody td.action a.delete:hover { + background-position: -38px -19px; +} +.main tbody td.action a.switch { + background: url(<%= asset_path "switch.png" %>) no-repeat left 3px; + width: 40px; +} +.main tbody tr.disable td.action a.switch { + background-position:left bottom; +} +.main tbody td.action a.delete:hover { + background-position: -38px -19px; +} +.main tbody tr.have { +} +.main tbody tr.disable { + opacity: 0.7; +} +.main tbody tr { + background:none; + height:15px; +} +h1{ + margin:0 0 20px; +} +p{ + margin:0 0 10px; +} + +#back_sidebar .items_setup .list li{ + background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top; + border:none; + padding: 0 0 0 5px; +} +#back_sidebar .items_setup .list li a{ + line-height:31px; +} +#back_sidebar .items_setup .list li:hover{ + background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top; + border:none; +} +#back_sidebar .items_setup ul .list { } \ No newline at end of file From eb2b4b80b7b136baf526a8a81a108f090c052963 Mon Sep 17 00:00:00 2001 From: Matt Fu Date: Fri, 16 Mar 2012 15:48:13 +0800 Subject: [PATCH 015/125] add new files --- .../app/models/bulletin - %BDしs.rb | 101 ++++++++++++++++++ .../fact_checks/_list_table.html.erb.can_del | 15 +++ .../fact_checks/_privilege_user.html.erb | 7 ++ .../fact_checks/index.html.erb.can_del | 50 +++++++++ .../back_end/fact_checks/setting.html.erb | 20 ++++ .../back_end/fact_checks/setting.js.erb | 1 + .../widget/bulletins/index.html - %BDしs.erb | 42 ++++++++ 7 files changed, 236 insertions(+) create mode 100644 vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb diff --git a/vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb b/vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb new file mode 100644 index 00000000..c65e65f7 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/models/bulletin - %BDしs.rb @@ -0,0 +1,101 @@ +# encoding: utf-8 + +class Bulletin + include Mongoid::Document + include Mongoid::Timestamps + include Mongoid::MultiParameterAttributes + + # field :category_id, :type => Integer + field :title + # has_one :title_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + # has_one :subtitle_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + # has_one :text_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + field :subtitle + field :text + field :postdate , :type => Date + field :deadline , :type => Date + # field :url + field :create_user_id + field :update_user_id + + field :is_top, :type => Boolean, :default => false + + mount_uploader :image, ImageUploader + + belongs_to :bulletin_category + + embeds_many :bulletin_links, :cascade_callbacks => true + embeds_many :bulletin_files, :cascade_callbacks => true + + # has_many :bulletin_files, :autosave => true, :dependent => :destroy + + accepts_nested_attributes_for :bulletin_files, :allow_destroy => true + accepts_nested_attributes_for :bulletin_links, :allow_destroy => true + + # validates_presence_of :title_variable + validates_presence_of :title + + after_save :save_bulletin_links + after_save :save_bulletin_files + + + def self.search( search = nil, category_id = nil ) + + if category_id.to_s.size > 0 and search.to_s.size > 0 + + key = /#{search}/ + + find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate ) + + elsif category_id.to_s.size > 0 and search.to_s.size < 1 + + find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate ) + + elsif search.to_s.size > 0 and category_id.to_s.size < 1 + + key = /#{search}/ + + find(:all, :conditions => {title: key}).desc( :is_top, :postdate ) + else + + find(:all).desc( :is_top, :postdate) + + end + + end + + + def self.widget_datas + + date_now = Time.now + + # find(:all, :conditions => {:postdate => {"$lte" => Date.today}, deadline: nil} ).desc( :is_top, :postdate) + # where( :postdate.lte => date_now ).where( :deadline => nil ).desc(:is_top, :postdate) + # any_of({ :title => "test" },{:deadline => nil, :title => "123"}) + any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).limit(5) + + + end + + + def is_top? + self.is_top + end + + def save_bulletin_links + self.bulletin_links.each do |t| + if t.should_destroy + t.destroy + end + end + end + + def save_bulletin_files + self.bulletin_files.each do |t| + if t.should_destroy + t.destroy + end + end + end + +end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del new file mode 100644 index 00000000..59bac03a --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_list_table.html.erb.can_del @@ -0,0 +1,15 @@ +

    <%= bulletin_category.key %>

    + + + + + + + + + + +<% bulletin_category.bulletins.each do |post| %> + <%= render :partial => 'panel/announcement/back_end/bulletins/bulletins', :locals => {:post => post,:fact_check_allow=>true} %> +<% end %> +
    <%= t('bulletin.status') %><%= t('bulletin.category') %><%= t('bulletin.title') %><%= t('bulletin.postdate') %><%= t('bulletin.deadline') %><%= t('bulletin.action') %>
    \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb new file mode 100644 index 00000000..347b15b2 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb @@ -0,0 +1,7 @@ +<%= content_tag :div ,:id => "users_checkbox_ary", do -%> +<% sys_users = User.all -%> + <% sys_users.each do |user| -%> + <%= label_tag "lab-user-#{user.id}", user.name rescue '' -%> + <%= check_box_tag "[users][#{user.id}]", 'true',users.include?(user) -%> + <% end -%> +<% end -%> \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del new file mode 100644 index 00000000..32f3d820 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/index.html.erb.can_del @@ -0,0 +1,50 @@ +<%= render 'panel/announcement/back_end/bulletins/filter' %> + + <%= render 'panel/announcement/back_end/bulletins/bulletins' %> +
    +
    + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %> +
    + + \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb new file mode 100644 index 00000000..d5d589cf --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb @@ -0,0 +1,20 @@ +<%= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %> +
    +<%= form_tag('', :remote => true) %> +<%= label_tag :category, t("announcement.bulletin.category") %> +<%= select_tag "category_id", options_from_collection_for_select(@bulletin_categorys, "id", "key") %> + +
    +<%= label_tag :role, t("admin.roles") %> +<%= content_tag :div do -%> + <% form_tag :action => "update_setting" do %> + <%= render :partial => "privilege_user", :locals => {:users => @users_array} %> + <%= submit_tag "Update" %> + <% end -%> +<% end -%> + + \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb new file mode 100644 index 00000000..a01c9d6a --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb @@ -0,0 +1 @@ +$("#users_checkbox_ary").replaceWith('<%= (render :partial => 'privilege_user', :locals => {:users => @users_array}).html_safe%>'); \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb new file mode 100644 index 00000000..2c4cd153 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb @@ -0,0 +1,42 @@ + + +<% if @bulletin and !@bulletin.nil? %> + +
    +

    <%= @bulletin.title %>

    +

    <%= @bulletin.subtitle %>

    + <%= link_to "read more >",panel_announcement_front_end_bulletin_path(@bulletin.id) %> + read more > +
    + +<% end %> + +<% if @bulletins and !@bulletins.nil? %> + +
    +

    news

    +
      + <% @bulletins.each do |post| %> +
    • <%= post.postdate.to_s.gsub("-", "") %><%= link_to post.title,panel_announcement_front_end_bulletin_path(post) %>
      • + <% end %> +
    +<%= link_to "read more >",panel_announcement_front_end_bulletins_path(), :class => "btn" %> +read more > +
    + +
    +

    news

    +
      + <% @bulletins.each do |post| %> +
    • + <%= image_tag(post.image.url, :size => "160x140") if post.image.file %> +

      <%= post.title %>

      + <%= post.subtitle %> +
      • + <% end %> +
    +<%= link_to "read more >",panel_announcement_front_end_bulletins_path(), :class => "btn" %> +read more > +
    + +<% end %> From c7a333f99034ff0095d8f6d655834b251ee454a3 Mon Sep 17 00:00:00 2001 From: Matt Fu Date: Fri, 16 Mar 2012 15:51:59 +0800 Subject: [PATCH 016/125] after merge --- .../bulletins/_bulletin_link.html - %BDしs.erb | 27 +++++++++++++++++++ .../_bulletin_link2.html - %BDしs.erb | 16 +++++++++++ .../back_end/bulletins/index.html - %BDしs.erb | 9 +++++++ 3 files changed, 52 insertions(+) create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb new file mode 100644 index 00000000..33d1ba1e --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb @@ -0,0 +1,27 @@ + +
    " class='list_item'> +
    + + <%= f.label :link_url %> + <%= f.text_field :url %> + + <%= f.label :link_name %> + <%#= f.text_field :name %> + <%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> + <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> + <%= f.text_field locale, :style => "width:130px" %> + <% end %> + <% end %> + + + <% if bulletin_link.new_record? %> + <%= t(:delete) %> + <% else %> + <%= f.hidden_field :id %> + <%= t(:delete) %> + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> + <% end %> + +
    +
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb new file mode 100644 index 00000000..c44b5c92 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb @@ -0,0 +1,16 @@ + + "> + <%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %> + <%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %> + + + <%= f.hidden_field :id %> + + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> + + + + + + + \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb new file mode 100644 index 00000000..d37d2134 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb @@ -0,0 +1,9 @@ +<%= render 'filter' %> + + <%= render 'bulletins' %> +
    + +
    + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %> +
    + From 7d553acaec68331b34e3bc261fd9ac114478a929 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 16 Mar 2012 15:53:57 +0800 Subject: [PATCH 017/125] fix announcement link & files --- app/assets/javascripts/bulletin_form.js.erb | 12 +- app/views/layouts/_side_bar.html.erb | 2 +- .../back_end/bulletin_links_controller.rb | 14 ++ .../back_end/bulletins_controller.rb | 2 +- .../bulletins/_bulletin_file.html.erb | 63 ++++--- .../bulletins/_bulletin_link.html.erb | 48 +++--- .../back_end/bulletins/_form.html.erb | 155 ++++++++++++------ .../bulletins/_quick_edit_links.html.erb | 12 +- .../back_end/bulletins/index.html.erb | 3 + .../announcement/config/routes.rb | 1 + 10 files changed, 200 insertions(+), 112 deletions(-) create mode 100644 vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb index 17f86060..a427667d 100644 --- a/app/assets/javascripts/bulletin_form.js.erb +++ b/app/assets/javascripts/bulletin_form.js.erb @@ -1,13 +1,15 @@ -$('.bulletin_links_block a.delete').live('click', function(){ - $(this).parents('.list_item').remove(); +$('.bulletin_links_block a.remove_existing_record').live('click', function(){ + //$(this).parents('.list_item').remove(); + $(this).parents('tr.list_item').remove(); }); -$('.bulletin_files_block a.delete').live('click', function(){ - $(this).parents('.list_item').remove(); +$('.bulletin_files_block a.remove_existing_record').live('click', function(){ + //$(this).parents('.list_item').remove(); + $(this).parents('tr.list_item').remove(); }); $('.action a.remove_existing_record').live('click', function(){ $(this).next('.should_destroy').attr('value', 1); - $("#bulletin_" + $(this).prev().attr('value')).hide(); + //$("#bulletin_" + $(this).prev().attr('value')).hide(); $("tr#bulletin_" + $(this).prev().attr('value')).hide(); }); \ No newline at end of file diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 61e2c4d8..220781a7 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -13,7 +13,7 @@ <% end -%> <%= content_tag :li, :class => active_for_controllers('users') do -%> - <%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), panel_web_resource_back_end_web_links_path %> + <%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %> <% end -%> <%= content_tag :li, :class => active_for_controllers('page_contexts') do -%> diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb new file mode 100644 index 00000000..04a75fa6 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb @@ -0,0 +1,14 @@ +class Panel::Announcement::BackEnd::BulletinLinksController < ApplicationController + + layout 'new_admin' + + def index + @bulletin_links = BulletinLink.all + + respond_to do |format| + format.html # index.html.erb + # format.xml { render :xml => @bulletins } + format.js + end + +end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 09e94c2d..77454b85 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -15,7 +15,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController # @bulletins = Bulletin.search(params[:search], params[:category_id]) # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]]) - @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all + @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.limit(1).desc("postdate") @bulletin_categories = BulletinCategory.all respond_to do |format| diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb index 6da49ceb..ef2d4bc7 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file.html.erb @@ -1,36 +1,47 @@ -
    " class='list_item'> -
    - <%= f.label :file %> - <%#= file_field_tag 'bulletin[file]' %> - <%= f.file_field :file %> - - <%= f.label :file_title %> - <%#= f.text_field :filetitle %> - <%= f.fields_for :filetitle, (bulletin_file.new_record? ? bulletin_file.build_filetitle : bulletin_file.filetitle ) do |f| %> - <% @site_valid_locales.each do |locale| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale %> + " class='list_item'> + +
    +
    + <%= f.file_field :file %> +
    +
    + + + <%= f.fields_for :filetitle, (bulletin_file.new_record? ? bulletin_file.build_filetitle : bulletin_file.filetitle ) do |f| %> + <% @site_valid_locales.each do |locale| %> +
    + +
    + <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> +
    +
    + <% end %> <% end %> - <% end %> - - <%= f.label :file_description %> - <%#= f.text_field :description %> - <%= f.fields_for :description, (bulletin_file.new_record? ? bulletin_file.build_description : bulletin_file.description ) do |f| %> - <% @site_valid_locales.each do |locale| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale %> + + + <%= f.fields_for :description, (bulletin_file.new_record? ? bulletin_file.build_description : bulletin_file.description ) do |f| %> + <% @site_valid_locales.each do |locale| %> +
    + +
    + <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> +
    +
    + <% end %> <% end %> - <% end %> - + + <% if bulletin_file.new_record? %> - <%= t(:delete) %> + <% else %> <%= f.hidden_field :id %> - <%= t(:delete) %> + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> <% end %> -
    -
    + + + + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb index e0077384..c8503083 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html.erb @@ -1,27 +1,37 @@ -
    " class='list_item'> -
    - - <%= f.label :link_url %> - <%= f.text_field :url %> - - <%= f.label :link_name %> - <%#= f.text_field :name %> - <%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %> - <% @site_valid_locales.each do |locale| %> - <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> - <%= f.text_field locale, :style => "width:130px" %> - <% end %> - <% end %> - + " class='list_item'> + + +
    +
    + <%= f.text_field :url %> +
    +
    + + + <%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> +
    +
    + <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> +
    +
    + + + + <% end %> + <% end %> + + + <% if bulletin_link.new_record? %> - <%= t(:delete) %> + <% else %> <%= f.hidden_field :id %> - <%= t(:delete) %> + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> <% end %> -
    -
    + + 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 2e41f302..3cefe360 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 @@ -13,7 +13,8 @@

    Picture

    - + +
    - - - + +
    + +
    @@ -202,38 +229,60 @@
    - +
    -
    - - - - -
    - -
    -

    Bulletin files

    - <%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %> - <%= t(:add) %> -
    - - <%#= render :partial => 'file', :locals => { :bulletin_files => @bulletin.bulletin_files , :f => f} %> - - - <% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %> - <%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %> - <%= f.fields_for :bulletin_files, bulletin_file do |f| %> - <%= render :partial => 'bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> - -
    - -
    -
    +
    + + + + +
    +
    +
    + +
    +

    File

    +
    + + + + + + + + + + + + + + + + +
    + + <% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %> + <%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %> + <%= f.fields_for :bulletin_files, bulletin_file do |f| %> + <%= render :partial => 'bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %> + <% end %> + <% end %> + +
    + + +
    FileName<%= t('description') %>
    +
    + <%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %> + ADD/啣 +
    +
    +
    +
    +
    -
    +
    @@ -252,13 +301,13 @@ var new_id = $(this).prev().attr('value'); var old_id = new RegExp("new_bulletin_links", "g"); $(this).prev().attr('value', parseInt(new_id) + 1); - $('#bulletin_links').append(("<%= escape_javascript(add_attribute 'bulletin_link', f, :bulletin_links) %>").replace(old_id, new_id)); + $(this).parents('table').append(("<%= escape_javascript(add_attribute 'bulletin_link', f, :bulletin_links) %>").replace(old_id, new_id)); }); $('#add_bulletin_file a.add').live('click', function(){ var new_id = $(this).prev().attr('value'); var old_id = new RegExp("new_bulletin_files", "g"); $(this).prev().attr('value', parseInt(new_id) + 1); - $('#bulletin_files').append(("<%= escape_javascript(add_attribute 'bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id)); + $(this).parents('table').append(("<%= escape_javascript(add_attribute 'bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id)); }); \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb new file mode 100644 index 00000000..a01c9d6a --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.js.erb @@ -0,0 +1 @@ +$("#users_checkbox_ary").replaceWith('<%= (render :partial => 'privilege_user', :locals => {:users => @users_array}).html_safe%>'); \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb new file mode 100644 index 00000000..2c4cd153 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html - %BDしs.erb @@ -0,0 +1,42 @@ + + +<% if @bulletin and !@bulletin.nil? %> + +
    +

    <%= @bulletin.title %>

    +

    <%= @bulletin.subtitle %>

    + <%= link_to "read more >",panel_announcement_front_end_bulletin_path(@bulletin.id) %> + read more > +
    + +<% end %> + +<% if @bulletins and !@bulletins.nil? %> + +
    +

    news

    +
      + <% @bulletins.each do |post| %> +
    • <%= post.postdate.to_s.gsub("-", "") %><%= link_to post.title,panel_announcement_front_end_bulletin_path(post) %>
      • + <% end %> +
    +<%= link_to "read more >",panel_announcement_front_end_bulletins_path(), :class => "btn" %> +read more > +
    + +
    +

    news

    +
      + <% @bulletins.each do |post| %> +
    • + <%= image_tag(post.image.url, :size => "160x140") if post.image.file %> +

      <%= post.title %>

      + <%= post.subtitle %> +
      • + <% end %> +
    +<%= link_to "read more >",panel_announcement_front_end_bulletins_path(), :class => "btn" %> +read more > +
    + +<% end %> From 670011495560a810823b00b43aec20ad226e20a6 Mon Sep 17 00:00:00 2001 From: Matt Fu Date: Fri, 16 Mar 2012 15:51:59 +0800 Subject: [PATCH 019/125] after merge --- .../bulletins/_bulletin_link.html - %BDしs.erb | 27 +++++++++++++++++++ .../_bulletin_link2.html - %BDしs.erb | 16 +++++++++++ .../back_end/bulletins/index.html - %BDしs.erb | 9 +++++++ 3 files changed, 52 insertions(+) create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb new file mode 100644 index 00000000..33d1ba1e --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link.html - %BDしs.erb @@ -0,0 +1,27 @@ + +
    " class='list_item'> +
    + + <%= f.label :link_url %> + <%= f.text_field :url %> + + <%= f.label :link_name %> + <%#= f.text_field :name %> + <%= f.fields_for :i18n_variable, (bulletin_link.new_record? ? bulletin_link.build_i18n_variable : bulletin_link.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> + <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> + <%= f.text_field locale, :style => "width:130px" %> + <% end %> + <% end %> + + + <% if bulletin_link.new_record? %> + <%= t(:delete) %> + <% else %> + <%= f.hidden_field :id %> + <%= t(:delete) %> + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> + <% end %> + +
    +
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb new file mode 100644 index 00000000..c44b5c92 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link2.html - %BDしs.erb @@ -0,0 +1,16 @@ + + "> + <%= link_to bulletin_link2.i18n_variable.zh_tw, bulletin_link2.url, :target => '_blank' %> + <%= link_to bulletin_link2.i18n_variable.en, bulletin_link2.url, :target => '_blank' %> + + + <%= f.hidden_field :id %> + + <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> + + + + + + + \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb new file mode 100644 index 00000000..d37d2134 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html - %BDしs.erb @@ -0,0 +1,9 @@ +<%= render 'filter' %> + + <%= render 'bulletins' %> +
    + +
    + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %> +
    + From b58db48d26e32dea6594e035bc7707248cda9143 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 19 Mar 2012 14:04:28 +0800 Subject: [PATCH 020/125] Changes in Gemfile --- Gemfile | 4 ++-- Gemfile.lock | 11 ++++++----- config/application.rb | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index fabc1833..024f3449 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem "brakeman" gem 'bson_ext' gem 'carrierwave' gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid' -gem 'devise' +gem 'devise', '1.5.3' gem 'exception_notification' # Send error trace gem 'execjs' gem 'jquery-rails' @@ -23,7 +23,7 @@ gem 'rubyzip' gem 'sinatra' gem 'sprockets' gem 'tinymce-rails' -#gem 'therubyracer' +gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux") # Gems used only for assets and not required # in production environments by default. diff --git a/Gemfile.lock b/Gemfile.lock index dd1a1d59..1df648c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM multi_json (~> 1.0) archive-tar-minitar (0.5.2) arel (2.2.3) - bcrypt-ruby (3.0.1-x86-mingw32) + bcrypt-ruby (3.0.1) brakeman (1.5.1) activesupport erubis (~> 2.6) @@ -71,11 +71,10 @@ GEM database_cleaner (0.7.1) delorean (1.2.0) chronic - devise (2.0.4) + devise (1.5.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) - railties (~> 3.1) - warden (~> 1.1.1) + warden (~> 1.1) diff-lcs (1.1.3) erubis (2.7.0) exception_notification (2.5.2) @@ -199,6 +198,7 @@ GEM rack (~> 1.3, >= 1.3.6) rack-protection (~> 1.2) tilt (~> 1.3, >= 1.3.3) + spork (0.9.0) spork (0.9.0-x86-mingw32) win32-process sprockets (2.0.3) @@ -232,6 +232,7 @@ GEM windows-api (>= 0.3.0) PLATFORMS + ruby x86-mingw32 DEPENDENCIES @@ -242,7 +243,7 @@ DEPENDENCIES coffee-rails database_cleaner delorean - devise + devise (= 1.5.3) exception_notification execjs factory_girl_rails diff --git a/config/application.rb b/config/application.rb index d1243133..381d1c64 100644 --- a/config/application.rb +++ b/config/application.rb @@ -19,7 +19,7 @@ module Orbit # Add directories for plugins config.paths["vendor/plugins"] += %W(#{config.root}/vendor/built_in_modules) config.paths["vendor/plugins"] += %W(#{config.root}/vendor/downloaded_modules) - config.paths.app.views << "app/views/devise" + config.paths["app/views"] += %W(#{config.root}/app/views/devise) # Settings in config/environments/* take precedence over those specified here. From 7cc075e12406fa1c5468bae073adde3c13dc38d2 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 19 Mar 2012 15:49:40 +0800 Subject: [PATCH 021/125] Change the monkey picture --- app/views/layouts/_orbit_bar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index e9a91f48..31fa6806 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -28,7 +28,7 @@ <% if user_signed_in? %>
  • From e95334496568b113f1aa184d16dfbeeb0afa760c Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 20 Mar 2012 14:17:28 +0800 Subject: [PATCH 022/125] Fix before_filter order for object_auth --- app/controllers/admin/object_auths_controller.rb | 9 +++++++-- app/controllers/orbit_backend_controller.rb | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/object_auths_controller.rb b/app/controllers/admin/object_auths_controller.rb index 58219acf..e8779dc4 100644 --- a/app/controllers/admin/object_auths_controller.rb +++ b/app/controllers/admin/object_auths_controller.rb @@ -1,8 +1,7 @@ class Admin::ObjectAuthsController < ApplicationController include OrbitCoreLib::PermissionUnility layout "admin" - before_filter :authenticate_user! - before_filter :check_if_user_can_do_object_auth + before_filter :force_order # before_filter :is_admin? ,:only => :index @@ -84,6 +83,12 @@ class Admin::ObjectAuthsController < ApplicationController end private + + def force_order + authenticate_user! + check_if_user_can_do_object_auth + end + def check_if_user_can_do_object_auth unless check_permission(:manager) render :nothing => true, :status => 403 diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb index b52384c6..c71bbf15 100644 --- a/app/controllers/orbit_backend_controller.rb +++ b/app/controllers/orbit_backend_controller.rb @@ -1,8 +1,8 @@ class OrbitBackendController< ApplicationController - before_filter :authenticate_user! + before_filter :force_order,:except => [:public] before_filter :setup_vars # before_filter {|c| c.front_end_available(@app_title)} - before_filter :check_user_can_use,:except => [:public] + # before_filter :check_user_can_use include OrbitCoreLib::PermissionUnility include AdminHelper @@ -15,6 +15,11 @@ class OrbitBackendController< ApplicationController private + def force_order + authenticate_user! + check_user_can_use + end + def check_user_can_use unless check_permission redirect_to polymorphic_path(['panel',@app_title,'back_end','public']) From c4d541d3b9d5b5dd26e622864749b981f159fdf1 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 21 Mar 2012 12:36:52 +0800 Subject: [PATCH 023/125] Remove code from back_end/bulletins/show --- .../announcement/back_end/bulletins/show.html.erb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb index 5a33b86a..158e07d0 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb @@ -1,15 +1,3 @@ -<% content_for :secondary do %> -<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %> -<% end -%> - -<%= flash_messages %> - -
    -
    -
    -
    -
    -
    • <%= t('announcement.category') %> From 5d7202af8b457eb100712ca5643e74b395a9fa5f Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 21 Mar 2012 12:37:52 +0800 Subject: [PATCH 024/125] Modify bulletin back-end index to show announcement in front-end --- .../panel/announcement/back_end/bulletins/_bulletin.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index e12af233..da802446 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -29,7 +29,7 @@
    • <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> - <%= link_to bulletin.title[I18n.locale], panel_announcement_back_end_bulletin_path(bulletin) rescue ''%> + <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin) rescue ''%> <%= bulletin.postdate %> <%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %> From 3aa7c5120deadba8de4252753a125533555fb551 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 21 Mar 2012 12:41:32 +0800 Subject: [PATCH 025/125] Put tinymce in its own js file. To use on a text area just add the class "tinymce_textarea". --- app/assets/javascripts/new_admin.js | 3 ++- app/assets/javascripts/tinymce_orbit.js | 26 +++++++++++++++++++ .../back_end/bulletins/_form.html.erb | 11 ++------ .../back_end/page_contexts/_form.html.erb | 13 +--------- 4 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 app/assets/javascripts/tinymce_orbit.js diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js index cd15fc39..3ec6f22f 100644 --- a/app/assets/javascripts/new_admin.js +++ b/app/assets/javascripts/new_admin.js @@ -10,4 +10,5 @@ //= require jquery.isotope.min //= require jquery.tinyscrollbar.min //= require orbit-1.0 -//= require tinymce-jquery \ No newline at end of file +//= require tinymce-jquery +//= require tinymce_orbit \ No newline at end of file diff --git a/app/assets/javascripts/tinymce_orbit.js b/app/assets/javascripts/tinymce_orbit.js new file mode 100644 index 00000000..89fb9390 --- /dev/null +++ b/app/assets/javascripts/tinymce_orbit.js @@ -0,0 +1,26 @@ +$(function() { + $('.tinymce_textarea').tinymce({ + theme: 'advanced', + plugins : "autolink,lists,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template", + + // Theme options + theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect", + theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor", + theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen", + theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage", + theme_advanced_toolbar_location : "top", + theme_advanced_toolbar_align : "left", + theme_advanced_statusbar_location : "bottom", + theme_advanced_resizing : false, + + // Skin options + skin : "o2k7", + skin_variant : "silver", + + // Drop lists for link/image/media/template dialogs + template_external_list_url : "js/template_list.js", + external_link_list_url : "js/link_list.js", + external_image_list_url : "js/image_list.js", + media_external_list_url : "js/media_list.js" + }); +}); \ No newline at end of file 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 d3e9f3a1..97f822d0 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 @@ -146,7 +146,7 @@ <% @site_valid_locales.each do |locale| %> <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%" %> + <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> <% end %> <% end %> @@ -158,7 +158,7 @@ <% @site_valid_locales.each do |locale| %> <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%" %> + <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> <% end %> <% end %> @@ -286,11 +286,4 @@ $(this).parents('table').append(("<%= escape_javascript(add_attribute 'bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id)); }); - <% end %> diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb index 4ca568a9..258aa55c 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb @@ -15,7 +15,7 @@ <% @site_valid_locales.each do |locale| %> <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%" %> + <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> <% end %> <% end %> @@ -27,14 +27,3 @@
    - - -<% content_for :page_specific_javascript do %> - -<% end %> \ No newline at end of file From 0e8f8b34246beb6247ef9a277dad03dba9789f6f Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 21 Mar 2012 12:58:13 +0800 Subject: [PATCH 026/125] Add missing category when redirect to front-end for bulletin back-end index --- .../panel/announcement/back_end/bulletins/_bulletin.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index da802446..ebd8f098 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -29,7 +29,7 @@
    <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> - <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin) rescue ''%> + <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%> <%= bulletin.postdate %> <%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %> From 472744fc875cf4ca5787d36facf97b6c232ad3fe Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 21 Mar 2012 15:51:55 +0800 Subject: [PATCH 027/125] Changes for IE9 with html5 --- app/assets/javascripts/html5.js | 3 +++ app/views/layouts/admin.html.erb | 2 +- app/views/layouts/devise.html.erb | 2 +- app/views/layouts/module_widget.html.erb | 2 +- app/views/layouts/new_admin.html.erb | 2 +- app/views/layouts/site_editor.html.erb | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 app/assets/javascripts/html5.js diff --git a/app/assets/javascripts/html5.js b/app/assets/javascripts/html5.js new file mode 100644 index 00000000..5c92911e --- /dev/null +++ b/app/assets/javascripts/html5.js @@ -0,0 +1,3 @@ +/*! HTML5 Shiv pre3.5 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed + Uncompressed source: https://github.com/aFarkas/html5shiv */ +(function(a,b){function h(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function i(){var a=l.elements;return typeof a=="string"?a.split(" "):a}function j(a){var b={},c=a.createElement,f=a.createDocumentFragment,g=f();a.createElement=function(a){l.shivMethods||c(a);var f;return b[a]?f=b[a].cloneNode():e.test(a)?f=(b[a]=c(a)).cloneNode():f=c(a),f.canHaveChildren&&!d.test(a)?g.appendChild(f):f},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+i().join().replace(/\w+/g,function(a){return b[a]=c(a),g.createElement(a),'c("'+a+'")'})+");return n}")(l,g)}function k(a){var b;return a.documentShived?a:(l.shivCSS&&!f&&(b=!!h(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),g||(b=!j(a)),b&&(a.documentShived=b),a)}function p(a){var b,c=a.getElementsByTagName("*"),d=c.length,e=RegExp("^(?:"+i().join("|")+")$","i"),f=[];while(d--)b=c[d],e.test(b.nodeName)&&f.push(b.applyElement(q(b)));return f}function q(a){var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(n+":"+a.nodeName);while(d--)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function r(a){var b,c=a.split("{"),d=c.length,e=RegExp("(^|[\\s,>+~])("+i().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),f="$1"+n+"\\:$2";while(d--)b=c[d]=c[d].split("}"),b[b.length-1]=b[b.length-1].replace(e,f),c[d]=b.join("}");return c.join("{")}function s(a){var b=a.length;while(b--)a[b].removeNode()}function t(a){var b,c,d=a.namespaces,e=a.parentWindow;return!o||a.printShived?a:(typeof d[n]=="undefined"&&d.add(n),e.attachEvent("onbeforeprint",function(){var d,e,f,g=a.styleSheets,i=[],j=g.length,k=Array(j);while(j--)k[j]=g[j];while(f=k.pop())if(!f.disabled&&m.test(f.media)){for(d=f.imports,j=0,e=d.length;j",f="hidden"in c,f&&typeof injectElementWithStyles=="function"&&injectElementWithStyles("#modernizr{}",function(b){b.hidden=!0,f=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle).display=="none"}),g=c.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var l={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:k};a.html5=l,k(b);var m=/^$|\b(?:all|print)\b/,n="html5shiv",o=!g&&function(){var c=b.documentElement;return typeof b.namespaces!="undefined"&&typeof b.parentWindow!="undefined"&&typeof c.applyElement!="undefined"&&typeof c.removeNode!="undefined"&&typeof a.attachEvent!="undefined"}();l.type+=" print",l.shivPrint=t,t(b)})(this,document) \ No newline at end of file diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index d800ab5d..4adce7a5 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -5,7 +5,7 @@ <%= @title || APP_CONFIG['orbit'] %> <%= stylesheet_link_tag "admin" %> <%= javascript_include_tag "admin" %> diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index 976b5422..d1a3512c 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -4,7 +4,7 @@ <%= @title || APP_CONFIG['orbit'] %> <%= stylesheet_link_tag "devise" %> <%= javascript_include_tag "devise" %> diff --git a/app/views/layouts/module_widget.html.erb b/app/views/layouts/module_widget.html.erb index 254ac4e9..44a2be85 100644 --- a/app/views/layouts/module_widget.html.erb +++ b/app/views/layouts/module_widget.html.erb @@ -2,7 +2,7 @@ <%#= stylesheet_link_tag "module_widget" %> <%= javascript_include_tag "module_widget" %> diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb index 3ae7a2a2..b6156c5d 100644 --- a/app/views/layouts/new_admin.html.erb +++ b/app/views/layouts/new_admin.html.erb @@ -4,7 +4,7 @@ <%= @title || APP_CONFIG['orbit'] %> <%= stylesheet_link_tag "new_admin" %> <%= javascript_include_tag "new_admin" %> diff --git a/app/views/layouts/site_editor.html.erb b/app/views/layouts/site_editor.html.erb index f4df75c4..efcc54ca 100644 --- a/app/views/layouts/site_editor.html.erb +++ b/app/views/layouts/site_editor.html.erb @@ -5,7 +5,7 @@ <%= @title || APP_CONFIG['orbit'] %> <%= stylesheet_link_tag "site_editor" %> <%= javascript_include_tag "site_editor" %> From a126935d2c66d8cd57f63f754b04ee549d852b4c Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 21 Mar 2012 18:30:12 +0800 Subject: [PATCH 028/125] Clean the parsers and introduce the metas --- app/models/meta.rb | 11 +++ app/models/meta/meta.rb | 11 +++ app/models/meta/page_meta.rb | 5 ++ app/models/meta/site_meta.rb | 5 ++ app/models/page.rb | 14 ++- app/models/site.rb | 2 + lib/parsers/parser_back_end.rb | 111 ++++++++++------------- lib/parsers/parser_front_end.rb | 154 ++++++++++++-------------------- lib/parsers/parser_layout.rb | 25 +++--- 9 files changed, 165 insertions(+), 173 deletions(-) create mode 100644 app/models/meta.rb create mode 100644 app/models/meta/meta.rb create mode 100644 app/models/meta/page_meta.rb create mode 100644 app/models/meta/site_meta.rb diff --git a/app/models/meta.rb b/app/models/meta.rb new file mode 100644 index 00000000..411a4f0c --- /dev/null +++ b/app/models/meta.rb @@ -0,0 +1,11 @@ +class Meta + + include Mongoid::Document + include Mongoid::Timestamps + + field :key + field :value, :default => nil + + has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy + +end diff --git a/app/models/meta/meta.rb b/app/models/meta/meta.rb new file mode 100644 index 00000000..411a4f0c --- /dev/null +++ b/app/models/meta/meta.rb @@ -0,0 +1,11 @@ +class Meta + + include Mongoid::Document + include Mongoid::Timestamps + + field :key + field :value, :default => nil + + has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy + +end diff --git a/app/models/meta/page_meta.rb b/app/models/meta/page_meta.rb new file mode 100644 index 00000000..9b3ded99 --- /dev/null +++ b/app/models/meta/page_meta.rb @@ -0,0 +1,5 @@ +class PageMeta < Meta + + belongs_to :page + +end diff --git a/app/models/meta/site_meta.rb b/app/models/meta/site_meta.rb new file mode 100644 index 00000000..9a17c4fa --- /dev/null +++ b/app/models/meta/site_meta.rb @@ -0,0 +1,5 @@ +class SiteMeta < Meta + + belongs_to :site + +end diff --git a/app/models/page.rb b/app/models/page.rb index ceead525..b9e06143 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -6,17 +6,23 @@ class Page < Item belongs_to :design belongs_to :module_app + has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy has_many :page_parts, :autosave => true, :dependent => :destroy has_many :page_contexts, :autosave => true, :dependent => :destroy + has_many :page_metas, :autosave => true, :dependent => :destroy accepts_nested_attributes_for :page_parts, :allow_destroy => true - before_save :create_parts + before_save :create_parts, :set_key # embeds_many :custom_images, :class_name => 'Image', as: :design_image def is_home? self.parent ? false : true end + + def title + @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil + end protected @@ -27,4 +33,10 @@ class Page < Item end end + def set_key + if title.new_record? + title.key = 'title' + end + end + end diff --git a/app/models/site.rb b/app/models/site.rb index 065a6f79..8f367c0a 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -12,6 +12,8 @@ class Site field :school field :department + + has_many :site_metas, :autosave => true, :dependent => :destroy def generate_keys private_key = OpenSSL::PKey::RSA.generate(2048) diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb index 37c22ed1..787f579b 100644 --- a/lib/parsers/parser_back_end.rb +++ b/lib/parsers/parser_back_end.rb @@ -13,63 +13,6 @@ module ParserBackEnd def parser_context_edit(page, attributes = {}) Radius::Context.new do |c| - c.define_tag 'snippet' do |tag| - snippet = Snippet.first(:conditions => {:name => tag.attr['name']}) - if snippet - snippet.content - else - t('nothing') - end - end - c.define_tag 'language_bar' do - @site.in_use_locales.map{ |locale| - lang = I18nVariable.first(:conditions => {:key => locale})[locale] - if I18n.locale.to_s.eql?(locale) - lang - else - "#{lang}" - end - }.join(' | ') - end - c.define_tag 'css' do |tag| - assets = Asset.any_in(:filename => tag.attr['name'].split(',').map(&:strip)) - res = '' - assets.each do |asset| - res << " " if asset.data.file.content_type.eql?('text/css') - end - res - end - c.define_tag 'image' do |tag| - # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } - # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - if image - res = "' - end - end - c.define_tag 'stylesheets' do |tag| - res = '' - res << "" if page.design.reset_css - res << "" if page.design.default_css - theme = page.design.themes.detect{ |d| d.id == page.theme_id } - res << "" if theme - res - end - c.define_tag 'javascripts' do |tag| - res = '' - res << "" - res << "" - res << "" - res << "" - page.design.javascripts.each do |js| - res << "" - end - res - end c.define_tag 'ad_banner' do |tag| res = '' ad_banner = AdBanner.find(tag.attr["id"]) rescue nil @@ -89,13 +32,6 @@ module ParserBackEnd res << "
    " end end - c.define_tag 'layout_part' do |tag| - part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } - ret = '' - ret << "
    " - ret << tag.expand - ret << '
    ' - end c.define_tag 'content' do |tag| ret = '' if (tag.attributes["main"] == "true" && !page.module_app.nil?) @@ -124,6 +60,39 @@ module ParserBackEnd end ret << '
    ' end + end + c.define_tag 'image' do |tag| + # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } + # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image + image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image + if image + res = "' + end + end + c.define_tag 'javascripts' do |tag| + res = '' + res << "" + res << "" + res << "" + res << "" + page.design.javascripts.each do |js| + res << "" + end + res + end + c.define_tag 'language_bar' do + @site.in_use_locales.map{ |locale| + lang = I18nVariable.first(:conditions => {:key => locale})[locale] + if I18n.locale.to_s.eql?(locale) + lang + else + "#{lang}" + end + }.join(' | ') end c.define_tag 'link' do |tag| item = Item.first(:conditions => { :full_name => tag.attr['name'] }) @@ -139,6 +108,20 @@ module ParserBackEnd menu = page.design.layout.menu menu_level(home, 0, menu, true) end + c.define_tag 'meta' do |tag| + "" + end + c.define_tag 'stylesheets' do |tag| + res = '' + res << "" if page.design.reset_css + res << "" if page.design.default_css + theme = page.design.themes.detect{ |d| d.id == page.theme_id } + res << "" if theme + res + end + c.define_tag 'title' do |tag| + "#{page.title ? page.title : page.i18n_variable[I18n.locale]}" + end end end diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 99353cc1..4b5a523f 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -4,88 +4,6 @@ module ParserFrontEnd def parser_context(page, attributes = {}, id = nil) Radius::Context.new do |c| - c.define_tag 'snippet' do |tag| - snippet = Snippet.first(:conditions => {:name => tag.attr['name']}) - if snippet - snippet.content - else - t('nothing') - end - end - c.define_tag 'language_bar' do - @site.in_use_locales.map{ |locale| - lang = I18nVariable.first(:conditions => {:key => locale})[locale] - if I18n.locale.to_s.eql?(locale) - lang - else - "#{lang}" - end - }.join(' | ') - end - c.define_tag 'locale' do |tag| - case attributes[:locale] - when 'create' - var = I18nVariable.new(:key => (tag.attr['name'] rescue nil), :document_class => 'Text') - @site.valid_locales.each do |locale| - var[locale] = tag.attr[locale] rescue nil - end - var.save! - res = '' - res << "' - when 'show' - var = I18nVariable.find(tag.attr['id']) - res = '' - res << "' - when 'destroy' - var = I18nVariable.find(tag.attr['id']) - var.destroy - end - end - c.define_tag 'css' do |tag| - assets = Asset.any_in(:filename => tag.attr['name'].split(',').map(&:strip)) - res = '' - assets.each do |asset| - res << " " if asset.data.file.content_type.eql?('text/css') - end - res - end - c.define_tag 'stylesheets' do |tag| - res = '' - res << "" - res << "" - res << "" - res << "" if page.design.reset_css - res << " " if page.design.default_css - theme = page.design.themes.detect{ |d| d.id == page.theme_id } - res << "" if theme - res - end - c.define_tag 'javascripts' do |tag| - res = '' - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - page.design.javascripts.each do |js| - # res << "" - end - res - end c.define_tag 'ad_banner' do |tag| res = '' ad_banner = AdBanner.find(tag.attr["id"]) rescue nil @@ -106,22 +24,6 @@ module ParserFrontEnd end res end - c.define_tag 'image' do |tag| - # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } - # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - if image - res = "' - end - end - c.define_tag 'layout_part' do |tag| - part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil - part.content - end c.define_tag 'content' do |tag| ret = '' if (tag.attributes["main"] == "true" && !page.module_app.nil?) @@ -149,6 +51,44 @@ module ParserFrontEnd end ret end + c.define_tag 'image' do |tag| + # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } + # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image + image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image + if image + res = "' + end + end + c.define_tag 'javascripts' do |tag| + res = '' + res << "" + res << "" + res << "" + res << "" + res << "" + res << "" + res << "" + res << "" + res << "" + page.design.javascripts.each do |js| + # res << "" + end + res + end + c.define_tag 'language_bar' do + @site.in_use_locales.map{ |locale| + lang = I18nVariable.first(:conditions => {:key => locale})[locale] + if I18n.locale.to_s.eql?(locale) + lang + else + "#{lang}" + end + }.join(' | ') + end c.define_tag 'link' do |tag| item = Item.first(:conditions => { :full_name => tag.attr['name'] }) ret = '' @@ -161,6 +101,24 @@ module ParserFrontEnd menu = page.design.layout.menu menu_level(home, 0, menu) end + c.define_tag 'meta' do |tag| + res = '' + #res << "" + end + c.define_tag 'stylesheets' do |tag| + res = '' + res << "" + res << "" + res << "" + res << "" if page.design.reset_css + res << " " if page.design.default_css + theme = page.design.themes.detect{ |d| d.id == page.theme_id } + res << "" if theme + res + end + c.define_tag 'title' do |tag| + "#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}" + end end end diff --git a/lib/parsers/parser_layout.rb b/lib/parsers/parser_layout.rb index 4a0232c6..063078df 100644 --- a/lib/parsers/parser_layout.rb +++ b/lib/parsers/parser_layout.rb @@ -10,12 +10,17 @@ module ParserLayout end def parser_layout_contents(layout) - Radius::Context.new do |c| - c.define_tag 'javascripts' do |tag| - end - c.define_tag 'stylesheets' do |tag| - end + Radius::Context.new do |c| c.define_tag 'ad_banner' do |tag| + end + c.define_tag 'content' do |tag| + layout.layout_parts.new(:name => tag.attr['name']) + end + c.define_tag 'image' do |tag| + image = layout.design.images.detect{ |i| i.file_identifier.eql?(parse_html_image(tag.expand)) } + image.update_attributes(:name => tag.attr['name'], :html_id => tag.attr['id'], :html_class => tag.attr['class']) if image + end + c.define_tag 'javascripts' do |tag| end c.define_tag 'menu' do |tag| layout.build_menu(:levels => 0, :values => {}) unless layout.menu @@ -24,13 +29,13 @@ module ParserLayout layout.menu.values.merge!({"id_#{i}" => tag.attr['id'], "class_#{i}" => tag.attr['class'], "li_class_#{i}" => tag.attr['li_class'], "li_incremental_#{i}" => tag.attr['li_incremental']}) tag.expand end - c.define_tag 'content' do |tag| - layout.layout_parts.new(:name => tag.attr['name']) + c.define_tag 'meta' do |tag| end - c.define_tag 'image' do |tag| - image = layout.design.images.detect{ |i| i.file_identifier.eql?(parse_html_image(tag.expand)) } - image.update_attributes(:name => tag.attr['name'], :html_id => tag.attr['id'], :html_class => tag.attr['class']) if image + c.define_tag 'stylesheets' do |tag| end + c.define_tag 'title' do |tag| + end + end end From 4f741418a09516082210ea1138ee62495e9bda81 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 22 Mar 2012 01:51:16 +0800 Subject: [PATCH 029/125] Trying nokogiri --- Gemfile | 1 + Gemfile.lock | 4 + app/controllers/application_controller.rb | 2 +- app/controllers/pages_controller.rb | 2 + app/helpers/application_helper.rb | 47 ++++++++++ app/models/design/layout.rb | 8 +- app/models/meta.rb | 4 + app/views/layouts/page_layout.html.erb | 17 ++++ lib/parsers/parser_front_end.rb | 105 ++++++++++++++-------- lib/parsers/parser_layout.rb | 57 +++++------- 10 files changed, 172 insertions(+), 75 deletions(-) create mode 100644 app/views/layouts/page_layout.html.erb diff --git a/Gemfile b/Gemfile index 024f3449..d1afdb8c 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git' gem 'mini_magick' gem 'mongoid' gem "mongo_session_store-rails3" +gem 'nokogiri' gem 'radius' gem 'rake' gem 'ruby-debug19' diff --git a/Gemfile.lock b/Gemfile.lock index 1df648c4..71742974 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,6 +41,7 @@ GEM archive-tar-minitar (0.5.2) arel (2.2.3) bcrypt-ruby (3.0.1) + bcrypt-ruby (3.0.1-x86-mingw32) brakeman (1.5.1) activesupport erubis (~> 2.6) @@ -115,6 +116,8 @@ GEM mongo (~> 1.3) tzinfo (~> 0.3.22) multi_json (1.1.0) + nokogiri (1.5.2) + nokogiri (1.5.2-x86-mingw32) orm_adapter (0.0.6) pdf-writer (1.1.8) color (>= 1.4.0) @@ -252,6 +255,7 @@ DEPENDENCIES mini_magick mongo_session_store-rails3 mongoid + nokogiri radius rails (>= 3.1.0, < 3.2.0) rake diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4b433777..fb82774e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -47,7 +47,7 @@ class ApplicationController < ActionController::Base # Render the page def render_page(id = nil) if @item - render :text => parse_page(@item, id) + render :text => process_page(@item, id), :layout => 'page_layout' else render :text => '404 Not Found' end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 8ea35391..4860ea2e 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,5 +1,7 @@ class PagesController < ApplicationController + include ApplicationHelper + before_filter :get_item, :only => [:index_from_link, :show_from_link] def index diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 50510e3c..9c03de3d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -107,4 +107,51 @@ module ApplicationHelper end end + + def process_page(page, id) + parse_page_noko(page, id) + end + + def page_metas(page) + metas = '' + @site.page_metas.each do |meta| + name, content = meta.get_name_content + metas << "\n" + end rescue nil + return metas + end + + def page_title(page) + "#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}\n" + end + + def page_stylesheets(page) + stylesheets = '' + stylesheets << "\n" + stylesheets << "\n" + stylesheets << "\n" + stylesheets << "\n" if page.design.reset_css + stylesheets << "\n" if page.design.default_css + theme = page.design.themes.detect{ |d| d.id == page.theme_id } + stylesheets << "\n" if theme + stylesheets + end + + def page_javascripts(page) + javascripts = '' + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + page.design.javascripts.each do |js| + # javascripts << "" + end + javascripts + end + end diff --git a/app/models/design/layout.rb b/app/models/design/layout.rb index e13498f3..bf48415c 100644 --- a/app/models/design/layout.rb +++ b/app/models/design/layout.rb @@ -2,6 +2,8 @@ class Layout < DesignFile include ParserLayout attr_reader :content + + field :body embeds_one :menu embedded_in :design @@ -17,8 +19,10 @@ class Layout < DesignFile Layout.count > 0 end - def parse_layout - parse_layout_contents(self) + def parse_layout + html = Nokogiri::HTML(self.file.read) + self.body = html.at_css("body").inner_html + parse_body(self) end end diff --git a/app/models/meta.rb b/app/models/meta.rb index 411a4f0c..dbeac167 100644 --- a/app/models/meta.rb +++ b/app/models/meta.rb @@ -7,5 +7,9 @@ class Meta field :value, :default => nil has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy + + def get_name_content + [self.key, self.value ? self.value : self.i18n_variable[I18n.locale]] + end end diff --git a/app/views/layouts/page_layout.html.erb b/app/views/layouts/page_layout.html.erb new file mode 100644 index 00000000..8fb884b0 --- /dev/null +++ b/app/views/layouts/page_layout.html.erb @@ -0,0 +1,17 @@ + + + + + <%= page_title(@item).html_safe %> + <%= page_metas(@item).html_safe %> + <%= @metas %> + + <%= page_stylesheets(@item).html_safe %> + <%= page_javascripts(@item).html_safe %> + + + <%= yield %> + + diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 4b5a523f..8ea3840a 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -63,22 +63,6 @@ module ParserFrontEnd res << '>' end end - c.define_tag 'javascripts' do |tag| - res = '' - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - page.design.javascripts.each do |js| - # res << "" - end - res - end c.define_tag 'language_bar' do @site.in_use_locales.map{ |locale| lang = I18nVariable.first(:conditions => {:key => locale})[locale] @@ -101,38 +85,87 @@ module ParserFrontEnd menu = page.design.layout.menu menu_level(home, 0, menu) end - c.define_tag 'meta' do |tag| - res = '' - #res << "" - end - c.define_tag 'stylesheets' do |tag| - res = '' - res << "" - res << "" - res << "" - res << "" if page.design.reset_css - res << " " if page.design.default_css - theme = page.design.themes.detect{ |d| d.id == page.theme_id } - res << "" if theme - res - end - c.define_tag 'title' do |tag| - "#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}" - end end end def parse_page(page, id = nil) if page._type == 'Page' - layout_content = page.design.layout.content.force_encoding('UTF-8') rescue '' context = parser_context(page, {}, id) parser = Radius::Parser.new(context, :tag_prefix => 'r') - parser.parse(parser.parse(layout_content)) + parser.parse(parser.parse(page.design.layout.body)) end end def self.included(base) base.send :helper_method, :parse_page if base.respond_to? :helper_method end + + + + require 'nokogiri' + + def parse_page_noko(page, id = nil) + body = Nokogiri::HTML(page.design.layout.body, nil, 'UTF-8') + + # page_contents + body.css('.page_content').each do |content| + ret = '' + if (content["main"] == "true" && !page.module_app.nil?) + ret << "
    " + else + part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil + case part.kind + when 'text' + ret << part.i18n_variable[I18n.locale] rescue '' + when 'module_widget' + if part[:category] + ret << "
    " + else + ret << "
    " + end + when 'public_r_tag' + ret << "" + else + '' + end + end + scope = "<#{content.name}" + content.attributes.each_pair do |key, value| + scope << " #{key}='#{value}'" + end + scope << ">#{ret}" + fragment = Nokogiri::HTML::DocumentFragment.new(body, scope) + content.swap(fragment) + end + + # page_menu + page_menu = body.css('.page_menu').first + home = get_homepage + menu = page.design.layout.menu + fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu)) + page_menu.swap(fragment) + + # page_image + body.css('.page_image').each do |page_image| + # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } + # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image + image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image + if image + res = "' + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, res) + page_image.swap(fragment) + end + + body.to_html + end end diff --git a/lib/parsers/parser_layout.rb b/lib/parsers/parser_layout.rb index 063078df..01d681ef 100644 --- a/lib/parsers/parser_layout.rb +++ b/lib/parsers/parser_layout.rb @@ -1,44 +1,27 @@ module ParserLayout - require 'radius' - include ParserCommon + require 'nokogiri' - def parse_layout_contents(layout) - content = layout.content.force_encoding('UTF-8') - context = parser_layout_contents(layout) - parser = Radius::Parser.new(context, :tag_prefix => 'r') - parser.parse(content) - end - - def parser_layout_contents(layout) - Radius::Context.new do |c| - c.define_tag 'ad_banner' do |tag| - end - c.define_tag 'content' do |tag| - layout.layout_parts.new(:name => tag.attr['name']) - end - c.define_tag 'image' do |tag| - image = layout.design.images.detect{ |i| i.file_identifier.eql?(parse_html_image(tag.expand)) } - image.update_attributes(:name => tag.attr['name'], :html_id => tag.attr['id'], :html_class => tag.attr['class']) if image - end - c.define_tag 'javascripts' do |tag| - end - c.define_tag 'menu' do |tag| - layout.build_menu(:levels => 0, :values => {}) unless layout.menu - layout.menu.levels = i = tag.attr['level'].to_i - layout.menu.values.merge!({'home' => tag.attr['home']}) if i == 1 - layout.menu.values.merge!({"id_#{i}" => tag.attr['id'], "class_#{i}" => tag.attr['class'], "li_class_#{i}" => tag.attr['li_class'], "li_incremental_#{i}" => tag.attr['li_incremental']}) - tag.expand - end - c.define_tag 'meta' do |tag| - end - c.define_tag 'stylesheets' do |tag| - end - c.define_tag 'title' do |tag| - end + def parse_body(layout) + body = Nokogiri::HTML(layout.body) + body.css('.page_content').each do |content| + layout.layout_parts.build(:name => content['name']) end + + body.css('.page_image').each do |image| + image = layout.design.images.detect{ |i| i.file_identifier.eql?(parse_html_image(image.to_html)) } + image.update_attributes(:name => image['name'], :html_id => image['id'], :html_class => image['class']) if image + end + + body.css('.page_menu').each do |menu| + layout.build_menu(:levels => 0, :values => {}) unless layout.menu + layout.menu.levels = i = menu['level'].to_i + layout.menu.values.merge!({'home' => menu['home']}) if i == 1 + layout.menu.values.merge!({"id_#{i}" => menu['id'], "class_#{i}" => menu['class'], "li_class_#{i}" => menu['li_class'], "li_incremental_#{i}" => menu['li_incremental']}) + end + end - + def parse_html_image(html) html.scan(/(?<=\)/){ $1.gsub(' ','').scan(/(?<=src=\")(.*?)(?=\")/){ @@ -46,4 +29,6 @@ module ParserLayout } } end + + end From b109410a7aeb456f01bbd529e5eb1c6a2f2ef63f Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 22 Mar 2012 10:11:02 +0800 Subject: [PATCH 030/125] Add ad_banner to nokogiri --- lib/parsers/parser_front_end.rb | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 8ea3840a..529802ff 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -105,7 +105,7 @@ module ParserFrontEnd require 'nokogiri' def parse_page_noko(page, id = nil) - body = Nokogiri::HTML(page.design.layout.body, nil, 'UTF-8') + body = Nokogiri::HTML(page.design.layout.body) # page_contents body.css('.page_content').each do |content| @@ -165,6 +165,29 @@ module ParserFrontEnd page_image.swap(fragment) end + # ad_banner + body.css('ad_banner').each do |banner| + res = '' + ad_banner = AdBanner.find(banner["id"]) rescue nil + if ad_banner && ad_banner.display? + res << "" + res << "
    " + ad_banner.ad_images.each do |ad_image| + res << "" + end + res << "
    " + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, res) + banner.swap(fragment) + end + body.to_html end From 34a4e47057730bb59f62b0d3570af5e84e04330e Mon Sep 17 00:00:00 2001 From: Matt Fu Date: Thu, 22 Mar 2012 14:33:59 +0800 Subject: [PATCH 031/125] Fact check program completed,Lin checked --- Gemfile.lock | 1 + app/models/object_auth.rb | 2 +- app/views/layouts/_side_bar.html.erb | 3 +- lib/orbit_core_lib.rb | 16 ++++-- .../back_end/bulletin_categorys_controller.rb | 2 +- .../back_end/bulletins_controller.rb | 51 +++++++++---------- .../back_end/fact_checks_controller.rb | 2 +- .../front_end/bulletins_controller.rb | 6 +-- .../widget/bulletins_controller.rb | 8 +-- .../announcement/app/models/bulletin.rb | 48 +++++++++-------- .../back_end/bulletins/_bulletin.html.erb | 10 +++- .../bulletins/_bulletin_link_qe.html.erb | 3 +- .../back_end/bulletins/_form.html.erb | 4 ++ .../widget/bulletins/index.html.erb | 1 - 14 files changed, 91 insertions(+), 66 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1df648c4..ef54f585 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,6 +41,7 @@ GEM archive-tar-minitar (0.5.2) arel (2.2.3) bcrypt-ruby (3.0.1) + bcrypt-ruby (3.0.1-x86-mingw32) brakeman (1.5.1) activesupport erubis (~> 2.6) diff --git a/app/models/object_auth.rb b/app/models/object_auth.rb index 8932bb76..ae3fd701 100644 --- a/app/models/object_auth.rb +++ b/app/models/object_auth.rb @@ -1,6 +1,6 @@ class ObjectAuth < PrototypeAuth include OrbitCoreLib::ObjectTokenUnility - validates_uniqueness_of :obj_authable_type,:scope => :title #{ |c| } + validates_uniqueness_of :title ,:scope => [:obj_authable_type,:obj_authable_id] #{ |c| } belongs_to :obj_authable, polymorphic: true # > - Something.find_with_auth(query) # > - or Something.find(query).auth diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 71e8106d..baeef6c4 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -9,8 +9,9 @@ <%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %> <%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %> <%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %> - <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') %> + <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') if is_manager? %> <% end -%> + <% end -%> <%= content_tag :li, :class => active_for_controllers('users') do -%> diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb index 561fceba..bcde17e0 100644 --- a/lib/orbit_core_lib.rb +++ b/lib/orbit_core_lib.rb @@ -21,11 +21,19 @@ module OrbitCoreLib def authed_users(title=nil) users = [] - unless title.nil? - users = self.object_auths.where(title: title )[0].auth_users_after_block_list rescue [] + users = case title + when :all + ary = self.object_auths.collect{|t| t.auth_users} + ary.flatten! + when nil + if self.object_auths.count ==1 + self.object_auths.first.auth_users_after_block_list rescue [] + else + logger.info "Warning calling a auth commend without specificed value( has multi-auths ), return empty" + [] + end else - users = self.object_auths.collect{|t| t.auth_users_after_block_list} rescue [] - users.flatten!.uniq! + self.object_auths.where(title: title).first.auth_users rescue [] end users end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb index 92bf922f..cb70aaf7 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb @@ -1,4 +1,4 @@ -class Panel::Announcement::BackEnd::BulletinCategorysController < ApplicationController +class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController layout 'new_admin' diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 0eda0723..2e6f90b0 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -110,40 +110,39 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController def link_quick_edit # debugger - - @bulletin = Bulletin.find(params[:bulletin_id]) - - @link_url = panel_announcement_back_end_bulletin_path(@bulletin) - - respond_to do |format| - format.js - end - + @bulletin = Bulletin.find(params[:bulletin_id]) + unless @bulletin.is_expired? + @link_url = panel_announcement_back_end_bulletin_path(@bulletin) + respond_to do |format| + format.js + end + end end # PUT /bulletins/1 # PUT /bulletins/1.xml def update @bulletin = Bulletin.find(params[:id]) + unless @bulletin.is_expired? + @bulletin.update_user_id = current_user.id - @bulletin.update_user_id = current_user.id - - # @bulletin.image.clear if params[:bulletin][:image_del] == '1' - # if params[:bulletin][:image_del] == '1' - # @bulletin.remove_image! - # @bulletin.image_del = nil - # params[:bulletin][:image_del] = nil - # end + # @bulletin.image.clear if params[:bulletin][:image_del] == '1' + # if params[:bulletin][:image_del] == '1' + # @bulletin.remove_image! + # @bulletin.image_del = nil + # params[:bulletin][:image_del] = nil + # end - respond_to do |format| - if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save - # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) } - format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) } - format.js { render 'toggle_enable' } - format.xml { head :ok } - else - format.html { render :action => "edit" } - format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity } + respond_to do |format| + if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save + # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) } + format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) } + format.js { render 'toggle_enable' } + format.xml { head :ok } + else + format.html { render :action => "edit" } + format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity } + end end end end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb index c47e91fb..9095a4d3 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb @@ -18,7 +18,7 @@ class Panel::Announcement::BackEnd::FactChecksController < OrbitBackendControll else first_category = @bulletin_categorys.first end - preload_object_auth = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check') + preload_object_auth = first_category.object_auths.where(title: 'fact_check').empty?? (first_category.object_auths.create! :title=> 'fact_check') : first_category.object_auths.where(title: 'fact_check') @users_array = preload_object_auth.first.privilege_users rescue [] respond_to do |format| format.html diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb index ff3cbdc9..fe0b2aa5 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb @@ -12,9 +12,9 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController date_now = Time.now if params[:category_id] - @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) + @bulletins = Bulletin.can_display.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) else - @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) + @bulletins = Bulletin.can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) end get_categorys @@ -23,7 +23,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController end def show - @bulletin = Bulletin.find(params[:id]) + @bulletin = Bulletin.can_display.where.where(_id: params[:id]) get_categorys end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index 60aad3d9..783ee9ef 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -14,9 +14,9 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController # @bulletin_categorys = BulletinCategory.first; # @bulletins = Bulletin.widget_datas(@bulletin_categorys.id).limit(9) if params[:category_id] - @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).widget_datas.limit(9) + @bulletins = Bulletin.can_display.where(:bulletin_category_id => params[:category_id]).widget_datas.limit(9) else - @bulletins = Bulletin.widget_datas.limit(9) + @bulletins = Bulletin.can_display.widget_datas.limit(9) end get_categorys @@ -26,14 +26,14 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController def bulletins_and_web_links @tags = AnnouncementTag.all @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0] - @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil + @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil render :layout => 'module_widget' end def reload_bulletins @selected_tag = AnnouncementTag.find(params[:tag_id]) - @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil + @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil end def reload_web_links diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index d1b7f3c5..e24f7f21 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -19,12 +19,14 @@ class Bulletin field :is_top, :type => Boolean, :default => false field :is_hot, :type => Boolean, :default => false field :is_hidden, :type => Boolean, :default => false - field :is_checked, :type => Boolean, :default => false + field :is_checked, :type => Boolean, :default => nil field :not_checked_reason field :public, :type => Boolean, :default => true + scope :can_display,where(is_checked: true) + mount_uploader :image, ImageUploader belongs_to :bulletin_category @@ -47,28 +49,17 @@ class Bulletin def self.search( search = nil, category_id = nil ) - - if category_id.to_s.size > 0 and search.to_s.size > 0 - + if category_id.to_s.size > 0 and search.to_s.size > 0 key = /#{search}/ - - find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate ) - - elsif category_id.to_s.size > 0 and search.to_s.size < 1 - - find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate ) - - elsif search.to_s.size > 0 and category_id.to_s.size < 1 - + find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate ) + elsif category_id.to_s.size > 0 and search.to_s.size < 1 + find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate ) + elsif search.to_s.size > 0 and category_id.to_s.size < 1 key = /#{search}/ - - find(:all, :conditions => {title: key}).desc( :is_top, :postdate ) - else - - find(:all).desc( :is_top, :postdate) - - end - + find(:all, :conditions => {title: key}).desc( :is_top, :postdate ) + else + find(:all).desc( :is_top, :postdate) + end end @@ -87,7 +78,11 @@ class Bulletin end end - + + def is_expired? + Date.today > self.deadline ? true : false rescue false + #some dates might sat as nil so rescue false + end def is_top? self.is_top @@ -101,6 +96,15 @@ class Bulletin self.is_hidden end + def is_checked? + self.is_checked + end + + def is_check_rejected? + self.is_checked == false + end + + def save_bulletin_links self.bulletin_links.each do |t| if t.should_destroy diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index e12af233..c0a9cee6 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -10,8 +10,10 @@ <% if bulletin.is_hidden? %> <%= t(:hidden) %> <% end %> +
      + <% unless bulletin.is_check_rejected?%>
    • <%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(bulletin) %>
    • <%= t(:quick_edit) %> @@ -23,10 +25,16 @@
    • <%= t(:file) %>
    -
  • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    • + <%#= debugger %> + <%#= a=1 %> + <% if (bulletin.bulletin_category.authed_users('fact_check').include?(current_user) or is_manager?) and !bulletin.is_expired? %>
  • <%= link_to t('bulletin.fact_check'), edit_panel_announcement_back_end_bulletin_path(bulletin) %>
    • <%#= #TODO add ancher so user can quick access into that part %> + <% end %> + <% end %> +
  • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    • + <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> <%= link_to bulletin.title[I18n.locale], panel_announcement_back_end_bulletin_path(bulletin) rescue ''%> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb index 7208f73c..55ea8e8c 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb @@ -1,6 +1,7 @@ <% # encoding: utf-8 %> - <%= form_for(@bulletin.bulletin_links, :remote => true, :url => @link_url) do |f| %> + + <%= form_for(@bulletin.bulletin_links, :remote => true, :url => @link_url) do |f| %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb index 5a33b86a..30cbbb56 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb @@ -1,7 +1,3 @@ -<% content_for :secondary do %> -<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %> -<% end -%> - <%= flash_messages %>
    From 422a49f56c50533807d7208068a416f589a37b77 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 15:03:00 +0800 Subject: [PATCH 043/125] Ray's changes in announcenment back-end --- app/assets/fonts/widget.css | 8 ++-- app/assets/javascripts/bootstrap.js | 3 +- app/assets/javascripts/orbit-1.0.js | 21 +++++++++- app/assets/stylesheets/bootstrap-orbit.css | 2 +- app/assets/stylesheets/list.css | 31 ++++++++++---- app/assets/stylesheets/reset.css.erb | 1 - app/assets/stylesheets/style.css.erb | 2 - app/assets/stylesheets/widget.css | 4 +- .../back_end/bulletins/_bulletin.html.erb | 20 ++++++---- .../back_end/bulletins/_bulletins.html.erb | 14 ++++++- .../back_end/bulletins/_filter.html.erb | 40 +++++++++++++++++++ .../back_end/bulletins/_form.html.erb | 27 ++++++++++--- .../back_end/bulletins/edit.html.erb | 17 ++++---- .../back_end/bulletins/new.html.erb | 4 +- 14 files changed, 150 insertions(+), 44 deletions(-) diff --git a/app/assets/fonts/widget.css b/app/assets/fonts/widget.css index 0c596876..fe83b22d 100644 --- a/app/assets/fonts/widget.css +++ b/app/assets/fonts/widget.css @@ -45,10 +45,10 @@ opacity: 1; filter: alpha(opacity=100); cursor: pointer; -} -.select-role { - display:none; - overflow:hidden; +} +.select-role { + display:none; + padding: 10px 0 0; } .file-upload { position:relative; diff --git a/app/assets/javascripts/bootstrap.js b/app/assets/javascripts/bootstrap.js index b822d62b..f1b88f8d 100644 --- a/app/assets/javascripts/bootstrap.js +++ b/app/assets/javascripts/bootstrap.js @@ -1251,7 +1251,8 @@ var that = this , complete = function () { if (startEvent == 'show') that.reset() - that.$element.trigger(completeEvent) + that.$element.trigger(completeEvent) + mainTablePosition(); } this.$element diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index f8daaecd..520473f6 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -49,6 +49,25 @@ $(document).ready(function(){ $(document).on('click', '.sort-header > .sort', function() { $.getScript($(this).attr('rel')); }); + + + var $role = $('.select-role'); + var method =$('.privacy:eq(1)').attr('checked'); + if(method == 'checked'){ + $role.slideDown(0); + } + $('.privacy').each(function($i) { + $(this).click(function() { + switch ($i) { + case 0: + $role.slideUp(300); + break; + case 1: + $role.slideDown(300); + break; + } + }); + }); /*tinyscrollbar&windows-Size*/ resize(); @@ -86,7 +105,7 @@ function mainTablePosition() { var $height = $('#main-wrap > .subnav').height() var $table = $('#main-wrap > .table') //alert ($table.height()) - $table.stop().animate({marginTop:$height},500) + $table.stop().animate({marginTop:$height-17},500) //$table.css({marginTop : $height}) } $(window).scroll(function () { diff --git a/app/assets/stylesheets/bootstrap-orbit.css b/app/assets/stylesheets/bootstrap-orbit.css index 88bca1b3..eede71d4 100644 --- a/app/assets/stylesheets/bootstrap-orbit.css +++ b/app/assets/stylesheets/bootstrap-orbit.css @@ -98,7 +98,7 @@ h1, h2, h3, h4, h5, h6 { border-radius: 0 0 4px 4px; } table .span1-2 { - width: 94px; + min-width: 85px; float: none; margin-left: 0; } diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css index ccf35f24..b4becb42 100644 --- a/app/assets/stylesheets/list.css +++ b/app/assets/stylesheets/list.css @@ -9,9 +9,9 @@ .main-list { margin-bottom: 0; } -.main-list thead th { - background-color: rgba(0,0,0,0.05); - border-right: 1px solid #ddd; +.main-wrap>.main-list thead th { + background-color: transparent; + border-right: medium none; } .main-list thead th:last-child { border-right: none; @@ -29,19 +29,22 @@ } .main-list tbody .quick-edit { position:relative; - height:40px; + height:20px; } .main-list tbody .quick-edit .nav { /*left: -55px;*/ position: absolute; /*top: -3px;*/ width: 350px; + left: -8px; } .main-list td { - /*height:80px;*/ + background-color: #FFFFFF; + border-bottom: 1px solid #DDDDDD; + border-top: medium none; } .main-list .nav { - margin-top: 15px; + margin-top: 0; margin-bottom: 3px; } .main-list tr.with_action:hover .hide { @@ -53,7 +56,7 @@ } .main-list .label-td { background-color: rgba(255, 255, 255, 1); - height: 60px; + height: 40px; overflow: hidden; position: absolute; width: 100%; @@ -74,6 +77,15 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; z-index: 5; +} +.table-label { + background-color: #F2F2F2; + position: relative; +} +.table-label .main-list thead th { + background-color: #F2F2F2; + border-right: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD !important; } .route-group .route { padding: 0; @@ -108,7 +120,10 @@ legend { -webkit-border-radius: 0; border-radius: 0; border-left: none; - border-right: none; + border-right: none; + position: fixed; + top: 30px; + z-index: 50; } .subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover { -moz-border-radius: 0; diff --git a/app/assets/stylesheets/reset.css.erb b/app/assets/stylesheets/reset.css.erb index 0d91f32a..5c0a9cd5 100644 --- a/app/assets/stylesheets/reset.css.erb +++ b/app/assets/stylesheets/reset.css.erb @@ -2,7 +2,6 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq -webkit-text-size-adjust:none; } html, body{ - background: url(<%= asset_path 'background.jpg' %>) repeat left top; height: 100%; } /*芸*/ diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index beae5a8e..2e203a02 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -350,8 +350,6 @@ border-top: none; } #post-body .editor { - background-color: #333333; - height: 20px; margin: 8px 0; width: 100%; } diff --git a/app/assets/stylesheets/widget.css b/app/assets/stylesheets/widget.css index b66a6074..b0e3568d 100644 --- a/app/assets/stylesheets/widget.css +++ b/app/assets/stylesheets/widget.css @@ -58,8 +58,8 @@ cursor: pointer; } .select-role { - display:none; - overflow:hidden; + display:none; + padding: 10px 0; } .file-upload { position:relative; diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index 64355320..0ae522cb 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -10,7 +10,10 @@ <% if bulletin.is_hidden? %> <%= t(:hidden) %> <% end %> - + + <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> + + <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%>
      <% unless bulletin.is_check_rejected?%> @@ -34,16 +37,17 @@
    • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    - - <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> - <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%> <%= bulletin.postdate %> <%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %> - <% bulletin.sorted_tags.each do |tag| %> - <%= tag[I18n.locale] %> - <% end %> +
    +
    + <% bulletin.sorted_tags.each do |tag| %> + <%= tag[I18n.locale] %> + <% end %> +
    +
    <%= User.from_id(bulletin.update_user_id).name rescue ''%> @@ -54,4 +58,4 @@ -<% end %> \ No newline at end of file +<% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb index bbe383bc..979f3f4a 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb @@ -1,4 +1,4 @@ - + + + + + + + + + + + + <%= render :partial => 'bulletin', :collection => @bulletins %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb index 5b078391..09222a36 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb @@ -53,5 +53,45 @@ Clear/蝵
    +
    + + + + + + + + + + + + + +
    + + + + <%= t('bulletin.status') %> + <%= content_tag(:b, nil, :class => is_sort?('status')) %> + + <%= t('bulletin.category') %> + <%= content_tag(:b, nil, :class => is_sort?('category')) %> + + <%= t('bulletin.title') %> + <%= content_tag(:b, nil, :class => is_sort?('title')) %> + + <%= t('bulletin.start_date') %> + <%= content_tag(:b, nil, :class => is_sort?('postdate')) %> + + <%= t('bulletin.end_date') %> + <%= content_tag(:b, nil, :class => is_sort?('deadline')) %> + + <%= t('bulletin.tags') %> + <%= content_tag(:b, nil, :class => is_sort?('tags')) %> + + <%= t('bulletin.last_modified') %> + <%= content_tag(:b, nil, :class => is_sort?('update_user_id')) %> +
    +
    \ No newline at end of file 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 27ad1df1..9b2d3557 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 @@ -3,13 +3,16 @@ <%= f.error_messages %>
    + <% if params[:action] != 'new' %>
    +

    Audit

    - <% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin?%> + + <% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin? %>
    <%= f.label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %> <%= content_tag :label,:class => "radio inline" do -%> @@ -29,6 +32,7 @@ <% end %>
    + <% end %>
    @@ -84,9 +88,18 @@

    Status

    - <%= f.check_box :is_top %><%= t('top') %> - <%= f.check_box :is_hot %><%= t('hot') %> - <%= f.check_box :is_hidden %><%= t('hide') %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= f.check_box :is_top %> + <%= t('top') %> + <% end -%> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= f.check_box :is_hot %> + <%= t('hot') %> + <% end -%> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= f.check_box :is_hidden %> + <%= t('hide') %> + <% end -%>
    @@ -98,8 +111,10 @@

    Tags

    <% @tags.each do |tag| %> - <%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%> - <%= tag[I18n.locale] %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%> + <%= tag[I18n.locale] %> + <% end %> <% end %>
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb index 56cfd258..c448c6a1 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb @@ -1,7 +1,10 @@ -

    <%= t('announcement.editing_announcement') %>

    - -<%= form_for @bulletin, :url => panel_announcement_back_end_bulletin_path(@bulletin), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> - -<%= link_back %> +
      +
    • Home/
      • +
    • Library/
      • +
    • <%= t('announcement.editing_announcement') %>
      • +
    +
    + <%= form_for @bulletin, :url => panel_announcement_back_end_bulletin_path(@bulletin), :html => {:class => 'clear'} do |f| %> + <%= render :partial => 'form', :locals => {:f => f} %> + <% end %> +
    \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb index 74e1291a..33a1e609 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb @@ -1,5 +1,5 @@ +
    <%= form_for @bulletin, :url => panel_announcement_back_end_bulletins_path do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <% end %> - -<%= link_back %> +
    \ No newline at end of file From 436c866a6fb95e219222384d8cfa60deee29cf70 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 15:10:29 +0800 Subject: [PATCH 044/125] admin now can post without fact check --- .../views/panel/announcement/back_end/bulletins/_form.html.erb | 2 ++ 1 file changed, 2 insertions(+) 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 9b2d3557..6815205c 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 @@ -32,6 +32,8 @@ <% end %>
    + <% elsif current_user.admin? %> + <%= f.hidden_field :is_checked,:value => true%> <% end %>
    From 1451c3ac1d70e873a91fc45e07c2b837d2adde6d Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 27 Mar 2012 15:34:21 +0800 Subject: [PATCH 045/125] changing to new admin_layout --- app/views/admin/ad_banners/_ad_banner.html.erb | 11 +++++++++++ .../back_end/bulletin_links_controller-複製.rb | 14 -------------- 2 files changed, 11 insertions(+), 14 deletions(-) create mode 100644 app/views/admin/ad_banners/_ad_banner.html.erb delete mode 100644 vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-複製.rb diff --git a/app/views/admin/ad_banners/_ad_banner.html.erb b/app/views/admin/ad_banners/_ad_banner.html.erb new file mode 100644 index 00000000..787a03ed --- /dev/null +++ b/app/views/admin/ad_banners/_ad_banner.html.erb @@ -0,0 +1,11 @@ + + + <%= location %> + + > + + <%= link_to (ad_image.picture_intro || t("untitled")),'' %> + <%= start_date %> + <%= end_date.nil?? t('form.date_unlimited'): end_date %> + <%= style %> + \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-複製.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-複製.rb deleted file mode 100644 index 04a75fa6..00000000 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-複製.rb +++ /dev/null @@ -1,14 +0,0 @@ -class Panel::Announcement::BackEnd::BulletinLinksController < ApplicationController - - layout 'new_admin' - - def index - @bulletin_links = BulletinLink.all - - respond_to do |format| - format.html # index.html.erb - # format.xml { render :xml => @bulletins } - format.js - end - -end From 48d1d45ced0f8481f25876fb847c9a713544ef11 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 17:57:50 +0800 Subject: [PATCH 046/125] Nokogiri in parsers --- app/views/admin/pages/_show.html.erb | 6 +- lib/parsers/parser_back_end.rb | 190 ++++++++++----------------- lib/parsers/parser_common.rb | 52 ++++++++ lib/parsers/parser_front_end.rb | 183 +++++--------------------- 4 files changed, 162 insertions(+), 269 deletions(-) diff --git a/app/views/admin/pages/_show.html.erb b/app/views/admin/pages/_show.html.erb index 1937fe92..ba9bcf48 100644 --- a/app/views/admin/pages/_show.html.erb +++ b/app/views/admin/pages/_show.html.erb @@ -1,3 +1,7 @@ <%= flash_messages %> -<%= parse_page_edit(@item).html_safe %> \ No newline at end of file + +<%= page_stylesheets(@item).html_safe %> +<%= page_javascripts(@item).html_safe %> + +<%= parse_page_edit_noko(@item).html_safe %> \ No newline at end of file diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb index 787f579b..3e641118 100644 --- a/lib/parsers/parser_back_end.rb +++ b/lib/parsers/parser_back_end.rb @@ -1,132 +1,86 @@ module ParserBackEnd - require 'radius' include ParserCommon - - def parse_page_edit(page) - if page._type == 'Page' - layout_content = page.design.layout.content.force_encoding('UTF-8') rescue '' - context = parser_context_edit(page) - parser = Radius::Parser.new(context, :tag_prefix => 'r') - parser.parse(parser.parse(layout_content)) + + require 'nokogiri' + + # c.define_tag 'language_bar' do + # @site.in_use_locales.map{ |locale| + # lang = I18nVariable.first(:conditions => {:key => locale})[locale] + # if I18n.locale.to_s.eql?(locale) + # lang + # else + # "#{lang}" + # end + # }.join(' | ') + # end + # c.define_tag 'link' do |tag| + # item = Item.first(:conditions => { :full_name => tag.attr['name'] }) + # ret = '' + # ret << "" + # ret << item.i18n_variable[I18n.locale] + # ret << "" + # end + + def parse_page_edit_noko(page, id = nil) + body = Nokogiri::HTML(page.design.layout.body) + parse_menu(body, page, true) + public_r_tags = parse_contents(body, page, id) + parse_images(body, page) + + public_r_tags.each do |tag| + send("parse_#{tag}s", body, page,id) end + + body.to_html end - - def parser_context_edit(page, attributes = {}) - Radius::Context.new do |c| - c.define_tag 'ad_banner' do |tag| - res = '' - ad_banner = AdBanner.find(tag.attr["id"]) rescue nil - if ad_banner - res << "" - res << "
    " - ad_banner.ad_images.each do |ad_image| - res << "" - end - res << "
    " - end - end - c.define_tag 'content' do |tag| - ret = '' - if (tag.attributes["main"] == "true" && !page.module_app.nil?) - ret << "
    " - else - part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } - ret << "
    " - ret << "' - case part.kind - when 'text' - ret << part.i18n_variable[I18n.locale] rescue '' - when 'module_widget' - if part[:category] - ret << "
    " - else - ret << "
    " - end - when 'public_r_tag' - ret << "" - else - '' - end - ret << '
    ' - end - end - c.define_tag 'image' do |tag| - # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } - # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - if image - res = "' - end - end - c.define_tag 'javascripts' do |tag| - res = '' - res << "" - res << "" - res << "" - res << "" - page.design.javascripts.each do |js| - res << "" - end - res - end - c.define_tag 'language_bar' do - @site.in_use_locales.map{ |locale| - lang = I18nVariable.first(:conditions => {:key => locale})[locale] - if I18n.locale.to_s.eql?(locale) - lang + + # page_contents + def parse_contents(body, page, id) + public_r_tags = [] + body.css('.page_content').each do |content| + ret = '' + if (content["main"] == "true" && !page.module_app.nil?) + ret << "
    " + else + part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil + ret << "
    " + ret << "' + case part.kind + when 'text' + ret << part.i18n_variable[I18n.locale] rescue '' + when 'module_widget' + if part[:category] + ret << "
    " else - "#{lang}" + ret << "
    " end - }.join(' | ') + when 'public_r_tag' + ret << "" + public_r_tags << part.public_r_tag + else + '' + end end - c.define_tag 'link' do |tag| - item = Item.first(:conditions => { :full_name => tag.attr['name'] }) - ret = '' - ret << "" - ret << item.i18n_variable[I18n.locale] - ret << "" - end - c.define_tag 'menu' do |tag| - home = get_homepage - menu = page.design.layout.menu - menu_level(home, 0, menu, true) - end - c.define_tag 'meta' do |tag| - "" - end - c.define_tag 'stylesheets' do |tag| - res = '' - res << "" if page.design.reset_css - res << "" if page.design.default_css - theme = page.design.themes.detect{ |d| d.id == page.theme_id } - res << "" if theme - res - end - c.define_tag 'title' do |tag| - "#{page.title ? page.title : page.i18n_variable[I18n.locale]}" + scope = "<#{content.name}" + content.attributes.each_pair do |key, value| + scope << " #{key}='#{value}'" end + scope << ">#{ret}" + fragment = Nokogiri::HTML::DocumentFragment.new(body, scope) + content.swap(fragment) end + public_r_tags.uniq end - + + def self.included(base) - base.send :helper_method, :parse_page_edit if base.respond_to? :helper_method + base.send :helper_method, :parse_page_edit_noko if base.respond_to? :helper_method end end diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 8d43c070..96cbb4b9 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -44,4 +44,56 @@ module ParserCommon res << "" end + # ad_banners + def parse_ad_banners(body = nil, page = nil, id = nil) + body.css('ad_banner').each do |banner| + res = '' + ad_banner = AdBanner.find(banner["id"]) rescue nil + if ad_banner && ad_banner.display? + res << "" + res << "
    " + ad_banner.ad_images.each do |ad_image| + res << "" + end + res << "
    " + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, res) + banner.swap(fragment) + end + end + + # page_images + def parse_images(body, page) + body.css('.page_image').each do |page_image| + # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } + # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image + image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image + if image + res = "' + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, res) + page_image.swap(fragment) + end + end + + # page_menu + def parse_menu(body, page, edit=nil) + page_menu = body.css('.page_menu').first + home = get_homepage + menu = page.design.layout.menu + fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu, true)) + page_menu.swap(fragment) + end + end diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 529802ff..c3ca1787 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -1,113 +1,42 @@ module ParserFrontEnd - require 'radius' include ParserCommon - - def parser_context(page, attributes = {}, id = nil) - Radius::Context.new do |c| - c.define_tag 'ad_banner' do |tag| - res = '' - ad_banner = AdBanner.find(tag.attr["id"]) rescue nil - if ad_banner && ad_banner.display? - res << "" - res << "
    " - ad_banner.ad_images.each do |ad_image| - res << "" - end - res << "
    " - end - res - end - c.define_tag 'content' do |tag| - ret = '' - if (tag.attributes["main"] == "true" && !page.module_app.nil?) - ret << "
    " - else - part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil - case part.kind - when 'text' - ret << part.i18n_variable[I18n.locale] rescue '' - when 'module_widget' - if part[:category] - ret << "
    " - else - ret << "
    " - end - when 'public_r_tag' - ret << "" - else - '' - end - end - ret - end - c.define_tag 'image' do |tag| - # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } - # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - if image - res = "' - end - end - c.define_tag 'language_bar' do - @site.in_use_locales.map{ |locale| - lang = I18nVariable.first(:conditions => {:key => locale})[locale] - if I18n.locale.to_s.eql?(locale) - lang - else - "#{lang}" - end - }.join(' | ') - end - c.define_tag 'link' do |tag| - item = Item.first(:conditions => { :full_name => tag.attr['name'] }) - ret = '' - ret << "" - ret << item.i18n_variable[I18n.locale] - ret << '' - end - c.define_tag 'menu' do |tag| - home = get_homepage - menu = page.design.layout.menu - menu_level(home, 0, menu) - end - end - end - - def parse_page(page, id = nil) - if page._type == 'Page' - context = parser_context(page, {}, id) - parser = Radius::Parser.new(context, :tag_prefix => 'r') - parser.parse(parser.parse(page.design.layout.body)) - end - end - - def self.included(base) - base.send :helper_method, :parse_page if base.respond_to? :helper_method - end - - + # c.define_tag 'language_bar' do + # @site.in_use_locales.map{ |locale| + # lang = I18nVariable.first(:conditions => {:key => locale})[locale] + # if I18n.locale.to_s.eql?(locale) + # lang + # else + # "#{lang}" + # end + # }.join(' | ') + # end + # c.define_tag 'link' do |tag| + # item = Item.first(:conditions => { :full_name => tag.attr['name'] }) + # ret = '' + # ret << "" + # ret << item.i18n_variable[I18n.locale] + # ret << '' + # end + # end require 'nokogiri' def parse_page_noko(page, id = nil) body = Nokogiri::HTML(page.design.layout.body) + parse_menu(body, page) + public_r_tags = parse_contents(body, page, id) + parse_images(body, page) - # page_contents + public_r_tags.each do |tag| + send("parse_#{tag}s", body, page,id) + end + + body.to_html + end + + # page_contents + def parse_contents(body, page, id) + public_r_tags = [] body.css('.page_content').each do |content| ret = '' if (content["main"] == "true" && !page.module_app.nil?) @@ -129,6 +58,7 @@ module ParserFrontEnd end when 'public_r_tag' ret << "" + public_r_tags << part.public_r_tag else '' end @@ -141,54 +71,7 @@ module ParserFrontEnd fragment = Nokogiri::HTML::DocumentFragment.new(body, scope) content.swap(fragment) end - - # page_menu - page_menu = body.css('.page_menu').first - home = get_homepage - menu = page.design.layout.menu - fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu)) - page_menu.swap(fragment) - - # page_image - body.css('.page_image').each do |page_image| - # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } - # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image - if image - res = "' - end - fragment = Nokogiri::HTML::DocumentFragment.new(body, res) - page_image.swap(fragment) - end - - # ad_banner - body.css('ad_banner').each do |banner| - res = '' - ad_banner = AdBanner.find(banner["id"]) rescue nil - if ad_banner && ad_banner.display? - res << "" - res << "
    " - ad_banner.ad_images.each do |ad_image| - res << "" - end - res << "
    " - end - fragment = Nokogiri::HTML::DocumentFragment.new(body, res) - banner.swap(fragment) - end - - body.to_html + public_r_tags.uniq end end From f5fd3dec7a015f3974f388927bf8637a5ce7f0fd Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 22 Mar 2012 01:51:16 +0800 Subject: [PATCH 047/125] Trying nokogiri --- Gemfile | 1 + Gemfile.lock | 4 + app/controllers/application_controller.rb | 2 +- app/controllers/pages_controller.rb | 2 + app/helpers/application_helper.rb | 47 ++++++++++ app/models/design/layout.rb | 8 +- app/models/meta.rb | 4 + app/views/layouts/page_layout.html.erb | 17 ++++ lib/parsers/parser_front_end.rb | 105 ++++++++++++++-------- lib/parsers/parser_layout.rb | 57 +++++------- 10 files changed, 172 insertions(+), 75 deletions(-) create mode 100644 app/views/layouts/page_layout.html.erb diff --git a/Gemfile b/Gemfile index 024f3449..d1afdb8c 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git' gem 'mini_magick' gem 'mongoid' gem "mongo_session_store-rails3" +gem 'nokogiri' gem 'radius' gem 'rake' gem 'ruby-debug19' diff --git a/Gemfile.lock b/Gemfile.lock index 1df648c4..71742974 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,6 +41,7 @@ GEM archive-tar-minitar (0.5.2) arel (2.2.3) bcrypt-ruby (3.0.1) + bcrypt-ruby (3.0.1-x86-mingw32) brakeman (1.5.1) activesupport erubis (~> 2.6) @@ -115,6 +116,8 @@ GEM mongo (~> 1.3) tzinfo (~> 0.3.22) multi_json (1.1.0) + nokogiri (1.5.2) + nokogiri (1.5.2-x86-mingw32) orm_adapter (0.0.6) pdf-writer (1.1.8) color (>= 1.4.0) @@ -252,6 +255,7 @@ DEPENDENCIES mini_magick mongo_session_store-rails3 mongoid + nokogiri radius rails (>= 3.1.0, < 3.2.0) rake diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4b433777..fb82774e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -47,7 +47,7 @@ class ApplicationController < ActionController::Base # Render the page def render_page(id = nil) if @item - render :text => parse_page(@item, id) + render :text => process_page(@item, id), :layout => 'page_layout' else render :text => '404 Not Found' end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 8ea35391..4860ea2e 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,5 +1,7 @@ class PagesController < ApplicationController + include ApplicationHelper + before_filter :get_item, :only => [:index_from_link, :show_from_link] def index diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 50510e3c..9c03de3d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -107,4 +107,51 @@ module ApplicationHelper end end + + def process_page(page, id) + parse_page_noko(page, id) + end + + def page_metas(page) + metas = '' + @site.page_metas.each do |meta| + name, content = meta.get_name_content + metas << "\n" + end rescue nil + return metas + end + + def page_title(page) + "#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}\n" + end + + def page_stylesheets(page) + stylesheets = '' + stylesheets << "\n" + stylesheets << "\n" + stylesheets << "\n" + stylesheets << "\n" if page.design.reset_css + stylesheets << "\n" if page.design.default_css + theme = page.design.themes.detect{ |d| d.id == page.theme_id } + stylesheets << "\n" if theme + stylesheets + end + + def page_javascripts(page) + javascripts = '' + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + javascripts << "\n" + page.design.javascripts.each do |js| + # javascripts << "" + end + javascripts + end + end diff --git a/app/models/design/layout.rb b/app/models/design/layout.rb index e13498f3..bf48415c 100644 --- a/app/models/design/layout.rb +++ b/app/models/design/layout.rb @@ -2,6 +2,8 @@ class Layout < DesignFile include ParserLayout attr_reader :content + + field :body embeds_one :menu embedded_in :design @@ -17,8 +19,10 @@ class Layout < DesignFile Layout.count > 0 end - def parse_layout - parse_layout_contents(self) + def parse_layout + html = Nokogiri::HTML(self.file.read) + self.body = html.at_css("body").inner_html + parse_body(self) end end diff --git a/app/models/meta.rb b/app/models/meta.rb index 411a4f0c..dbeac167 100644 --- a/app/models/meta.rb +++ b/app/models/meta.rb @@ -7,5 +7,9 @@ class Meta field :value, :default => nil has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy + + def get_name_content + [self.key, self.value ? self.value : self.i18n_variable[I18n.locale]] + end end diff --git a/app/views/layouts/page_layout.html.erb b/app/views/layouts/page_layout.html.erb new file mode 100644 index 00000000..8fb884b0 --- /dev/null +++ b/app/views/layouts/page_layout.html.erb @@ -0,0 +1,17 @@ + + + + + <%= page_title(@item).html_safe %> + <%= page_metas(@item).html_safe %> + <%= @metas %> + + <%= page_stylesheets(@item).html_safe %> + <%= page_javascripts(@item).html_safe %> + + + <%= yield %> + + diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 4b5a523f..8ea3840a 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -63,22 +63,6 @@ module ParserFrontEnd res << '>' end end - c.define_tag 'javascripts' do |tag| - res = '' - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - res << "" - page.design.javascripts.each do |js| - # res << "" - end - res - end c.define_tag 'language_bar' do @site.in_use_locales.map{ |locale| lang = I18nVariable.first(:conditions => {:key => locale})[locale] @@ -101,38 +85,87 @@ module ParserFrontEnd menu = page.design.layout.menu menu_level(home, 0, menu) end - c.define_tag 'meta' do |tag| - res = '' - #res << "" - end - c.define_tag 'stylesheets' do |tag| - res = '' - res << "" - res << "" - res << "" - res << "" if page.design.reset_css - res << " " if page.design.default_css - theme = page.design.themes.detect{ |d| d.id == page.theme_id } - res << "" if theme - res - end - c.define_tag 'title' do |tag| - "#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]}" - end end end def parse_page(page, id = nil) if page._type == 'Page' - layout_content = page.design.layout.content.force_encoding('UTF-8') rescue '' context = parser_context(page, {}, id) parser = Radius::Parser.new(context, :tag_prefix => 'r') - parser.parse(parser.parse(layout_content)) + parser.parse(parser.parse(page.design.layout.body)) end end def self.included(base) base.send :helper_method, :parse_page if base.respond_to? :helper_method end + + + + require 'nokogiri' + + def parse_page_noko(page, id = nil) + body = Nokogiri::HTML(page.design.layout.body, nil, 'UTF-8') + + # page_contents + body.css('.page_content').each do |content| + ret = '' + if (content["main"] == "true" && !page.module_app.nil?) + ret << "
    " + else + part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil + case part.kind + when 'text' + ret << part.i18n_variable[I18n.locale] rescue '' + when 'module_widget' + if part[:category] + ret << "
    " + else + ret << "
    " + end + when 'public_r_tag' + ret << "" + else + '' + end + end + scope = "<#{content.name}" + content.attributes.each_pair do |key, value| + scope << " #{key}='#{value}'" + end + scope << ">#{ret}" + fragment = Nokogiri::HTML::DocumentFragment.new(body, scope) + content.swap(fragment) + end + + # page_menu + page_menu = body.css('.page_menu').first + home = get_homepage + menu = page.design.layout.menu + fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu)) + page_menu.swap(fragment) + + # page_image + body.css('.page_image').each do |page_image| + # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } + # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image + image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image + if image + res = "' + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, res) + page_image.swap(fragment) + end + + body.to_html + end end diff --git a/lib/parsers/parser_layout.rb b/lib/parsers/parser_layout.rb index 063078df..01d681ef 100644 --- a/lib/parsers/parser_layout.rb +++ b/lib/parsers/parser_layout.rb @@ -1,44 +1,27 @@ module ParserLayout - require 'radius' - include ParserCommon + require 'nokogiri' - def parse_layout_contents(layout) - content = layout.content.force_encoding('UTF-8') - context = parser_layout_contents(layout) - parser = Radius::Parser.new(context, :tag_prefix => 'r') - parser.parse(content) - end - - def parser_layout_contents(layout) - Radius::Context.new do |c| - c.define_tag 'ad_banner' do |tag| - end - c.define_tag 'content' do |tag| - layout.layout_parts.new(:name => tag.attr['name']) - end - c.define_tag 'image' do |tag| - image = layout.design.images.detect{ |i| i.file_identifier.eql?(parse_html_image(tag.expand)) } - image.update_attributes(:name => tag.attr['name'], :html_id => tag.attr['id'], :html_class => tag.attr['class']) if image - end - c.define_tag 'javascripts' do |tag| - end - c.define_tag 'menu' do |tag| - layout.build_menu(:levels => 0, :values => {}) unless layout.menu - layout.menu.levels = i = tag.attr['level'].to_i - layout.menu.values.merge!({'home' => tag.attr['home']}) if i == 1 - layout.menu.values.merge!({"id_#{i}" => tag.attr['id'], "class_#{i}" => tag.attr['class'], "li_class_#{i}" => tag.attr['li_class'], "li_incremental_#{i}" => tag.attr['li_incremental']}) - tag.expand - end - c.define_tag 'meta' do |tag| - end - c.define_tag 'stylesheets' do |tag| - end - c.define_tag 'title' do |tag| - end + def parse_body(layout) + body = Nokogiri::HTML(layout.body) + body.css('.page_content').each do |content| + layout.layout_parts.build(:name => content['name']) end + + body.css('.page_image').each do |image| + image = layout.design.images.detect{ |i| i.file_identifier.eql?(parse_html_image(image.to_html)) } + image.update_attributes(:name => image['name'], :html_id => image['id'], :html_class => image['class']) if image + end + + body.css('.page_menu').each do |menu| + layout.build_menu(:levels => 0, :values => {}) unless layout.menu + layout.menu.levels = i = menu['level'].to_i + layout.menu.values.merge!({'home' => menu['home']}) if i == 1 + layout.menu.values.merge!({"id_#{i}" => menu['id'], "class_#{i}" => menu['class'], "li_class_#{i}" => menu['li_class'], "li_incremental_#{i}" => menu['li_incremental']}) + end + end - + def parse_html_image(html) html.scan(/(?<=\)/){ $1.gsub(' ','').scan(/(?<=src=\")(.*?)(?=\")/){ @@ -46,4 +29,6 @@ module ParserLayout } } end + + end From 7efaddf57cb78c3f9203de59e456c548f9147fa3 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 22 Mar 2012 10:11:02 +0800 Subject: [PATCH 048/125] Add ad_banner to nokogiri --- lib/parsers/parser_front_end.rb | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 8ea3840a..529802ff 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -105,7 +105,7 @@ module ParserFrontEnd require 'nokogiri' def parse_page_noko(page, id = nil) - body = Nokogiri::HTML(page.design.layout.body, nil, 'UTF-8') + body = Nokogiri::HTML(page.design.layout.body) # page_contents body.css('.page_content').each do |content| @@ -165,6 +165,29 @@ module ParserFrontEnd page_image.swap(fragment) end + # ad_banner + body.css('ad_banner').each do |banner| + res = '' + ad_banner = AdBanner.find(banner["id"]) rescue nil + if ad_banner && ad_banner.display? + res << "" + res << "
    " + ad_banner.ad_images.each do |ad_image| + res << "" + end + res << "
    " + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, res) + banner.swap(fragment) + end + body.to_html end From 3ba89ecbcff0a7f513f5d6d469591e95e4e2c92c Mon Sep 17 00:00:00 2001 From: Matt Fu Date: Thu, 22 Mar 2012 14:33:59 +0800 Subject: [PATCH 049/125] Fact check program completed,Lin checked --- app/models/object_auth.rb | 2 +- app/views/layouts/_side_bar.html.erb | 3 +- lib/orbit_core_lib.rb | 16 ++- .../back_end/bulletin_categorys_controller.rb | 2 +- .../back_end/bulletins_controller.rb | 106 +++++++++--------- .../back_end/fact_checks_controller.rb | 2 +- .../front_end/bulletins_controller.rb | 6 +- .../widget/bulletins_controller.rb | 8 +- .../announcement/app/models/bulletin.rb | 48 ++++---- .../back_end/bulletins/_bulletin.html.erb | 12 +- .../bulletins/_bulletin_link_qe.html.erb | 66 +++++------ .../back_end/bulletins/_form.html.erb | 2 + .../widget/bulletins/index.html.erb | 1 - 13 files changed, 144 insertions(+), 130 deletions(-) diff --git a/app/models/object_auth.rb b/app/models/object_auth.rb index 8932bb76..ae3fd701 100644 --- a/app/models/object_auth.rb +++ b/app/models/object_auth.rb @@ -1,6 +1,6 @@ class ObjectAuth < PrototypeAuth include OrbitCoreLib::ObjectTokenUnility - validates_uniqueness_of :obj_authable_type,:scope => :title #{ |c| } + validates_uniqueness_of :title ,:scope => [:obj_authable_type,:obj_authable_id] #{ |c| } belongs_to :obj_authable, polymorphic: true # > - Something.find_with_auth(query) # > - or Something.find(query).auth diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 71e8106d..baeef6c4 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -9,8 +9,9 @@ <%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %> <%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %> <%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %> - <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') %> + <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') if is_manager? %> <% end -%> + <% end -%> <%= content_tag :li, :class => active_for_controllers('users') do -%> diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb index 561fceba..bcde17e0 100644 --- a/lib/orbit_core_lib.rb +++ b/lib/orbit_core_lib.rb @@ -21,11 +21,19 @@ module OrbitCoreLib def authed_users(title=nil) users = [] - unless title.nil? - users = self.object_auths.where(title: title )[0].auth_users_after_block_list rescue [] + users = case title + when :all + ary = self.object_auths.collect{|t| t.auth_users} + ary.flatten! + when nil + if self.object_auths.count ==1 + self.object_auths.first.auth_users_after_block_list rescue [] + else + logger.info "Warning calling a auth commend without specificed value( has multi-auths ), return empty" + [] + end else - users = self.object_auths.collect{|t| t.auth_users_after_block_list} rescue [] - users.flatten!.uniq! + self.object_auths.where(title: title).first.auth_users rescue [] end users end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb index f55ad6e3..97378c5a 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb @@ -1,4 +1,4 @@ -class Panel::Announcement::BackEnd::BulletinCategorysController < ApplicationController +class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController layout 'new_admin' diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 31f446a0..31b3b4a2 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -159,12 +159,12 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController end def file_quick_add - # debugger + # debugger @bulletin_file = BulletinFile.new - @file_url = panel_announcement_back_end_bulletins_path + @file_url = panel_announcement_back_end_bulletins_path - @bulletin_file.bulletin_id = params[:bulletin_id] + @bulletin_file.bulletin_id = params[:bulletin_id] respond_to do |format| format.js @@ -173,75 +173,73 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController end def file_quick_edit - # debugger + # debugger @bulletin_file = BulletinFile.find(params[:bulletin_id]) - @file_url = panel_announcement_back_end_bulletin_path(@bulletin_file) + @file_url = panel_announcement_back_end_bulletin_path(@bulletin_file) respond_to do |format| format.js end - end # PUT /bulletins/1 # PUT /bulletins/1.xml def update - if params[:bulletin_link] - - @bulletin_link = BulletinLink.find(params[:id]) - - @link_url = panel_announcement_back_end_bulletin_path(@bulletin_link) + if params[:bulletin_link] + + @bulletin_link = BulletinLink.find(params[:id]) + + @link_url = panel_announcement_back_end_bulletin_path(@bulletin_link) - respond_to do |format| - if @bulletin_link.update_attributes(params[:bulletin_link]) - # format.html { redirect_to(panel_announcement_back_end_bulletins_url) } - format.js { render 'update_bulletin_link' } - end - end - - elsif params[:bulletin_file] - - @bulletin_file = BulletinFile.find(params[:id]) - - @file_url = panel_announcement_back_end_bulletin_path(@bulletin_file) + respond_to do |format| + if @bulletin_link.update_attributes(params[:bulletin_link]) + # format.html { redirect_to(panel_announcement_back_end_bulletins_url) } + format.js { render 'update_bulletin_link' } + end + end + + elsif params[:bulletin_file] + + @bulletin_file = BulletinFile.find(params[:id]) + + @file_url = panel_announcement_back_end_bulletin_path(@bulletin_file) - respond_to do |format| - if @bulletin_file.update_attributes(params[:bulletin_file]) - # format.html { redirect_to(panel_announcement_back_end_bulletins_url) } - format.js { render 'update_bulletin_file' } - end - end - - else - - @bulletin = Bulletin.find(params[:id]) - - @bulletin.update_user_id = current_user.id - - # @bulletin.image.clear if params[:bulletin][:image_del] == '1' - # if params[:bulletin][:image_del] == '1' - # @bulletin.remove_image! - # @bulletin.image_del = nil - # params[:bulletin][:image_del] = nil - # end + respond_to do |format| + if @bulletin_file.update_attributes(params[:bulletin_file]) + # format.html { redirect_to(panel_announcement_back_end_bulletins_url) } + format.js { render 'update_bulletin_file' } + end + end + + else + + @bulletin = Bulletin.find(params[:id]) + + @bulletin.update_user_id = current_user.id + + # @bulletin.image.clear if params[:bulletin][:image_del] == '1' + # if params[:bulletin][:image_del] == '1' + # @bulletin.remove_image! + # @bulletin.image_del = nil + # params[:bulletin][:image_del] = nil + # end - respond_to do |format| - if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save - # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) } - format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) } - format.js { render 'toggle_enable' } - format.xml { head :ok } - else - format.html { render :action => "edit" } - format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity } - end - end + respond_to do |format| + if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save + # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) } + format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) } + format.js { render 'toggle_enable' } + format.xml { head :ok } + else + format.html { render :action => "edit" } + format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity } + end + end end - end # DELETE /bulletins/1 diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb index c47e91fb..9095a4d3 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb @@ -18,7 +18,7 @@ class Panel::Announcement::BackEnd::FactChecksController < OrbitBackendControll else first_category = @bulletin_categorys.first end - preload_object_auth = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check') + preload_object_auth = first_category.object_auths.where(title: 'fact_check').empty?? (first_category.object_auths.create! :title=> 'fact_check') : first_category.object_auths.where(title: 'fact_check') @users_array = preload_object_auth.first.privilege_users rescue [] respond_to do |format| format.html diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb index ff3cbdc9..fe0b2aa5 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb @@ -12,9 +12,9 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController date_now = Time.now if params[:category_id] - @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) + @bulletins = Bulletin.can_display.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) else - @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) + @bulletins = Bulletin.can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) end get_categorys @@ -23,7 +23,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController end def show - @bulletin = Bulletin.find(params[:id]) + @bulletin = Bulletin.can_display.where.where(_id: params[:id]) get_categorys end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index 60aad3d9..783ee9ef 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -14,9 +14,9 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController # @bulletin_categorys = BulletinCategory.first; # @bulletins = Bulletin.widget_datas(@bulletin_categorys.id).limit(9) if params[:category_id] - @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).widget_datas.limit(9) + @bulletins = Bulletin.can_display.where(:bulletin_category_id => params[:category_id]).widget_datas.limit(9) else - @bulletins = Bulletin.widget_datas.limit(9) + @bulletins = Bulletin.can_display.widget_datas.limit(9) end get_categorys @@ -26,14 +26,14 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController def bulletins_and_web_links @tags = AnnouncementTag.all @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0] - @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil + @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil render :layout => 'module_widget' end def reload_bulletins @selected_tag = AnnouncementTag.find(params[:tag_id]) - @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil + @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil end def reload_web_links diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index d1b7f3c5..e24f7f21 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -19,12 +19,14 @@ class Bulletin field :is_top, :type => Boolean, :default => false field :is_hot, :type => Boolean, :default => false field :is_hidden, :type => Boolean, :default => false - field :is_checked, :type => Boolean, :default => false + field :is_checked, :type => Boolean, :default => nil field :not_checked_reason field :public, :type => Boolean, :default => true + scope :can_display,where(is_checked: true) + mount_uploader :image, ImageUploader belongs_to :bulletin_category @@ -47,28 +49,17 @@ class Bulletin def self.search( search = nil, category_id = nil ) - - if category_id.to_s.size > 0 and search.to_s.size > 0 - + if category_id.to_s.size > 0 and search.to_s.size > 0 key = /#{search}/ - - find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate ) - - elsif category_id.to_s.size > 0 and search.to_s.size < 1 - - find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate ) - - elsif search.to_s.size > 0 and category_id.to_s.size < 1 - + find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate ) + elsif category_id.to_s.size > 0 and search.to_s.size < 1 + find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate ) + elsif search.to_s.size > 0 and category_id.to_s.size < 1 key = /#{search}/ - - find(:all, :conditions => {title: key}).desc( :is_top, :postdate ) - else - - find(:all).desc( :is_top, :postdate) - - end - + find(:all, :conditions => {title: key}).desc( :is_top, :postdate ) + else + find(:all).desc( :is_top, :postdate) + end end @@ -87,7 +78,11 @@ class Bulletin end end - + + def is_expired? + Date.today > self.deadline ? true : false rescue false + #some dates might sat as nil so rescue false + end def is_top? self.is_top @@ -101,6 +96,15 @@ class Bulletin self.is_hidden end + def is_checked? + self.is_checked + end + + def is_check_rejected? + self.is_checked == false + end + + def save_bulletin_links self.bulletin_links.each do |t| if t.should_destroy diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index 5338fb41..a67464c1 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -10,8 +10,10 @@ <% if bulletin.is_hidden? %> <%= t(:hidden) %> <% end %> +
      + <% unless bulletin.is_check_rejected?%>
    • <%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(bulletin) %>
    • <%= t(:quick_edit) %> @@ -23,10 +25,16 @@
    • <%= link_to t(:file), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %>
    -
  • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    • + <%#= debugger %> + <%#= a=1 %> + <% if (bulletin.bulletin_category.authed_users('fact_check').include?(current_user) or is_manager?) and !bulletin.is_expired? %>
  • <%= link_to t('bulletin.fact_check'), edit_panel_announcement_back_end_bulletin_path(bulletin) %>
    • <%#= #TODO add ancher so user can quick access into that part %> + <% end %> + <% end %> +
  • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    • + <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%> @@ -39,4 +47,4 @@ <%= User.from_id(bulletin.update_user_id).name rescue ''%> - \ No newline at end of file + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb index b9006352..c146da48 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb @@ -1,43 +1,37 @@ <% # encoding: utf-8 %> - <%= form_for(@bulletin_link, :remote => true, :url => @link_url) do |f| %> - - -
    - -

    <%= (@bulletin_link.new_record? ? 'Add Link' : 'Edit Link') %>

    -
    -
    -
    - -
    - <%= f.text_field :url %> -
    -
    - - <%= f.fields_for :i18n_variable, (@bulletin_link.new_record? ? @bulletin_link.build_i18n_variable : @bulletin_link.i18n_variable) do |f| %> - <% @site_valid_locales.each do |locale| %> -
    - <%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> -
    - <%#= f.text_field locale, :class => 'input-xxlarge' %> - <%= f.text_field locale %> -
    -
    - <% end %> - <% end %> - -
    - -
    - <%= hidden_field_tag 'bulletin_link[bulletin_id]', @bulletin_link.bulletin_id %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= t('cancel')%> - -
    +<%= form_for(@bulletin_link, :remote => true, :url => @link_url) do |f| %> + +
    + +

    <%= (@bulletin_link.new_record? ? 'Add Link' : 'Edit Link') %>

    +
    +
    +
    + +
    + <%= f.text_field :url %> +
    +
    - + <%= f.fields_for :i18n_variable, (@bulletin_link.new_record? ? @bulletin_link.build_i18n_variable : @bulletin_link.i18n_variable) do |f| %> + <% @site_valid_locales.each do |locale| %> +
    + <%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> +
    + <%#= f.text_field locale, :class => 'input-xxlarge' %> + <%= f.text_field locale %> +
    +
    <% end %> + <% end %> + +
    + <%= hidden_field_tag 'bulletin_link[bulletin_id]', @bulletin_link.bulletin_id %> + <%= f.submit t('submit'), :class=>'btn btn-primary' %> + <%= t('cancel')%> +<% end %> \ No newline at end of file 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 2f524322..983ae5b2 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 @@ -2,6 +2,8 @@ <%= f.error_messages %> <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %> + + <% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin?%>
    <%= label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %> <%= f.radio_button :is_checked, true%> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb index 33166165..3cf5731d 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb @@ -1,7 +1,6 @@ <% # encoding: utf-8 %> <% if @bulletins and !@bulletins.nil? %> -

    <%= t('announcement.campus_news')%>

    <%= link_to t('announcement.more'),panel_announcement_front_end_bulletins_path(), :class => "topic_note" %>
    previous page
    From 97adf94e15ad3d714fc1af0a0bea6b0e28083db9 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Fri, 23 Mar 2012 12:00:48 +0800 Subject: [PATCH 050/125] fix with what ray needs for the fact_check form --- .../back_end/bulletins/_form.html.erb | 94 +++++++++++++------ 1 file changed, 64 insertions(+), 30 deletions(-) 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 983ae5b2..f24ad40b 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 @@ -14,11 +14,37 @@ <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %> <%= f.text_field :not_checked_reason %>
    - + + <%= f.error_messages %>
    - +
    +
    + +
    +

    Audit

    +
    + <% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin?%> +
    + <%= f.label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %> + <%= content_tag :label,:class => "radio inline" do -%> + <%= f.radio_button :is_checked, true , {:class => 'privacy'} %> + <%= t('announcement.bulletin.fact_check_pass') %> + <% end -%> + <%= content_tag :label,:class => "radio inline" do -%> + <%= f.radio_button :is_checked, false, (@bulletin.is_checked.nil?? {:checked => true, :class => 'privacy'} : {})%> + <%= t('announcement.bulletin.fact_check_not_pass') %> + <% end -%> +
    + <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %> + <%= f.text_field :not_checked_reason %> +
    + +
    + <% end %> +
    +
    @@ -102,24 +128,36 @@
    + +
    + <%= f.label :image, t('announcement.image') %>
    + <%= f.file_field :image %> + <% if @bulletin.image.file %> + <%= check_box_tag 'bulletin[image_del]' %> + <%= t('announcement.芷文歇銝單獢') %> + <% end %> +
    <%= f.label :category %> <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %> -
    - - English - - - + +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    @@ -127,14 +165,14 @@ <%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %> <% @site_valid_locales.each do |locale| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title' %> - + <%= I18nVariable.from_locale(locale) %> + <%= f.text_field locale, :class=>'post-title' %> + <% end %> <% end %> -
    +
    -
    +
    <%= f.label :subtitle %> <%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %> <% @site_valid_locales.each do |locale| %> @@ -146,7 +184,7 @@ <% end %>
    -
    +
    <%= f.label :text %> <%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %> <% @site_valid_locales.each do |locale| %> @@ -158,7 +196,6 @@ <% end %>
    -
    -
    - - -
    @@ -257,10 +291,10 @@
    -
    - +
    - +
    +
    <%= f.submit t('submit'), :class=>'btn btn-primary' %> <%= link_to t('cancel'), get_go_back, :class=>"btn" %> From 55d12e50f2ccc5013a3ebf6e4b3a773e3001a2fa Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 15:03:00 +0800 Subject: [PATCH 051/125] Ray's changes in announcenment back-end --- app/assets/fonts/widget.css | 8 ++-- app/assets/javascripts/bootstrap.js | 3 +- app/assets/javascripts/orbit-1.0.js | 21 +++++++++- app/assets/stylesheets/bootstrap-orbit.css | 2 +- app/assets/stylesheets/list.css | 31 ++++++++++---- app/assets/stylesheets/reset.css.erb | 1 - app/assets/stylesheets/style.css.erb | 2 - app/assets/stylesheets/widget.css | 4 +- .../back_end/bulletins/_bulletin.html.erb | 18 +++++---- .../back_end/bulletins/_bulletins.html.erb | 14 ++++++- .../back_end/bulletins/_filter.html.erb | 40 +++++++++++++++++++ .../back_end/bulletins/_form.html.erb | 27 ++++++++++--- .../back_end/bulletins/edit.html.erb | 17 ++++---- .../back_end/bulletins/new.html.erb | 6 +-- 14 files changed, 150 insertions(+), 44 deletions(-) diff --git a/app/assets/fonts/widget.css b/app/assets/fonts/widget.css index 0c596876..fe83b22d 100644 --- a/app/assets/fonts/widget.css +++ b/app/assets/fonts/widget.css @@ -45,10 +45,10 @@ opacity: 1; filter: alpha(opacity=100); cursor: pointer; -} -.select-role { - display:none; - overflow:hidden; +} +.select-role { + display:none; + padding: 10px 0 0; } .file-upload { position:relative; diff --git a/app/assets/javascripts/bootstrap.js b/app/assets/javascripts/bootstrap.js index 116cfe61..af3bc727 100644 --- a/app/assets/javascripts/bootstrap.js +++ b/app/assets/javascripts/bootstrap.js @@ -1250,7 +1250,8 @@ var that = this , complete = function () { if (startEvent == 'show') that.reset() - that.$element.trigger(completeEvent) + that.$element.trigger(completeEvent) + mainTablePosition(); } this.$element diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index 91df38a1..cbb6e0b8 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -43,6 +43,25 @@ $(document).ready(function(){ $(document).on('click', '.sort-header > .sort', function() { $.getScript($(this).attr('rel')); }); + + + var $role = $('.select-role'); + var method =$('.privacy:eq(1)').attr('checked'); + if(method == 'checked'){ + $role.slideDown(0); + } + $('.privacy').each(function($i) { + $(this).click(function() { + switch ($i) { + case 0: + $role.slideUp(300); + break; + case 1: + $role.slideDown(300); + break; + } + }); + }); /*tinyscrollbar&windows-Size*/ resize(); @@ -80,7 +99,7 @@ function mainTablePosition() { var $height = $('#main-wrap > .subnav').height() var $table = $('#main-wrap > .table') //alert ($table.height()) - $table.stop().animate({marginTop:$height},500) + $table.stop().animate({marginTop:$height-17},500) //$table.css({marginTop : $height}) } $(window).scroll(function () { diff --git a/app/assets/stylesheets/bootstrap-orbit.css b/app/assets/stylesheets/bootstrap-orbit.css index 88bca1b3..eede71d4 100644 --- a/app/assets/stylesheets/bootstrap-orbit.css +++ b/app/assets/stylesheets/bootstrap-orbit.css @@ -98,7 +98,7 @@ h1, h2, h3, h4, h5, h6 { border-radius: 0 0 4px 4px; } table .span1-2 { - width: 94px; + min-width: 85px; float: none; margin-left: 0; } diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css index ccf35f24..b4becb42 100644 --- a/app/assets/stylesheets/list.css +++ b/app/assets/stylesheets/list.css @@ -9,9 +9,9 @@ .main-list { margin-bottom: 0; } -.main-list thead th { - background-color: rgba(0,0,0,0.05); - border-right: 1px solid #ddd; +.main-wrap>.main-list thead th { + background-color: transparent; + border-right: medium none; } .main-list thead th:last-child { border-right: none; @@ -29,19 +29,22 @@ } .main-list tbody .quick-edit { position:relative; - height:40px; + height:20px; } .main-list tbody .quick-edit .nav { /*left: -55px;*/ position: absolute; /*top: -3px;*/ width: 350px; + left: -8px; } .main-list td { - /*height:80px;*/ + background-color: #FFFFFF; + border-bottom: 1px solid #DDDDDD; + border-top: medium none; } .main-list .nav { - margin-top: 15px; + margin-top: 0; margin-bottom: 3px; } .main-list tr.with_action:hover .hide { @@ -53,7 +56,7 @@ } .main-list .label-td { background-color: rgba(255, 255, 255, 1); - height: 60px; + height: 40px; overflow: hidden; position: absolute; width: 100%; @@ -74,6 +77,15 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; z-index: 5; +} +.table-label { + background-color: #F2F2F2; + position: relative; +} +.table-label .main-list thead th { + background-color: #F2F2F2; + border-right: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD !important; } .route-group .route { padding: 0; @@ -108,7 +120,10 @@ legend { -webkit-border-radius: 0; border-radius: 0; border-left: none; - border-right: none; + border-right: none; + position: fixed; + top: 30px; + z-index: 50; } .subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover { -moz-border-radius: 0; diff --git a/app/assets/stylesheets/reset.css.erb b/app/assets/stylesheets/reset.css.erb index 0d91f32a..5c0a9cd5 100644 --- a/app/assets/stylesheets/reset.css.erb +++ b/app/assets/stylesheets/reset.css.erb @@ -2,7 +2,6 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq -webkit-text-size-adjust:none; } html, body{ - background: url(<%= asset_path 'background.jpg' %>) repeat left top; height: 100%; } /*芸*/ diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index beae5a8e..2e203a02 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -350,8 +350,6 @@ border-top: none; } #post-body .editor { - background-color: #333333; - height: 20px; margin: 8px 0; width: 100%; } diff --git a/app/assets/stylesheets/widget.css b/app/assets/stylesheets/widget.css index b66a6074..b0e3568d 100644 --- a/app/assets/stylesheets/widget.css +++ b/app/assets/stylesheets/widget.css @@ -58,8 +58,8 @@ cursor: pointer; } .select-role { - display:none; - overflow:hidden; + display:none; + padding: 10px 0; } .file-upload { position:relative; diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index a67464c1..62b28c0c 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -10,7 +10,10 @@ <% if bulletin.is_hidden? %> <%= t(:hidden) %> <% end %> - + + <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> + + <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%>
      <% unless bulletin.is_check_rejected?%> @@ -34,16 +37,17 @@
    • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    - - <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> - <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%> <%= bulletin.postdate %> <%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %> - <% bulletin.sorted_tags.each do |tag| %> - <%= tag[I18n.locale] %> - <% end %> +
    +
    + <% bulletin.sorted_tags.each do |tag| %> + <%= tag[I18n.locale] %> + <% end %> +
    +
    <%= User.from_id(bulletin.update_user_id).name rescue ''%> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb index bbe383bc..979f3f4a 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb @@ -1,4 +1,4 @@ - + + + + + + + + + + + + <%= render :partial => 'bulletin', :collection => @bulletins %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb index 5b078391..09222a36 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb @@ -53,5 +53,45 @@ Clear/蝵
    +
    + + + + + + + + + + + + + +
    + + + + <%= t('bulletin.status') %> + <%= content_tag(:b, nil, :class => is_sort?('status')) %> + + <%= t('bulletin.category') %> + <%= content_tag(:b, nil, :class => is_sort?('category')) %> + + <%= t('bulletin.title') %> + <%= content_tag(:b, nil, :class => is_sort?('title')) %> + + <%= t('bulletin.start_date') %> + <%= content_tag(:b, nil, :class => is_sort?('postdate')) %> + + <%= t('bulletin.end_date') %> + <%= content_tag(:b, nil, :class => is_sort?('deadline')) %> + + <%= t('bulletin.tags') %> + <%= content_tag(:b, nil, :class => is_sort?('tags')) %> + + <%= t('bulletin.last_modified') %> + <%= content_tag(:b, nil, :class => is_sort?('update_user_id')) %> +
    +
    \ No newline at end of file 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 f24ad40b..6dec078c 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 @@ -19,13 +19,16 @@ <%= f.error_messages %>
    + <% if params[:action] != 'new' %>
    +

    Audit

    - <% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin?%> + + <% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin? %>
    <%= f.label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %> <%= content_tag :label,:class => "radio inline" do -%> @@ -45,6 +48,7 @@ <% end %>
    + <% end %>
    @@ -100,9 +104,18 @@

    Status

    - <%= f.check_box :is_top %><%= t('top') %> - <%= f.check_box :is_hot %><%= t('hot') %> - <%= f.check_box :is_hidden %><%= t('hide') %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= f.check_box :is_top %> + <%= t('top') %> + <% end -%> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= f.check_box :is_hot %> + <%= t('hot') %> + <% end -%> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= f.check_box :is_hidden %> + <%= t('hide') %> + <% end -%>
    @@ -114,8 +127,10 @@

    Tags

    <% @tags.each do |tag| %> - <%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%> - <%= tag[I18n.locale] %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id)%> + <%= tag[I18n.locale] %> + <% end %> <% end %>
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb index ffe288cd..27211047 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb @@ -1,7 +1,10 @@ -

    <%= t('announcement.editing_announcement') %>

    - -<%= form_for @bulletin, :url => panel_announcement_back_end_bulletin_path(@bulletin), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> - -<%#= link_back %> +
      +
    • Home/
      • +
    • Library/
      • +
    • <%= t('announcement.editing_announcement') %>
      • +
    +
    + <%= form_for @bulletin, :url => panel_announcement_back_end_bulletin_path(@bulletin), :html => {:class => 'clear'} do |f| %> + <%= render :partial => 'form', :locals => {:f => f} %> + <% end %> +
    diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb index c05b645b..ded7fba0 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb @@ -1,5 +1,5 @@ -<%= form_for @bulletin, :url => panel_announcement_back_end_bulletins_path, :html => {:class => 'clear'} do |f| %> +
    +<%= form_for @bulletin, :url => panel_announcement_back_end_bulletins_path do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <% end %> - -<%#= link_back %> +
    From 07ba457dd7cd7edb2aca8ea1650f8449de7ffcf6 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 15:10:29 +0800 Subject: [PATCH 052/125] admin now can post without fact check --- .../views/panel/announcement/back_end/bulletins/_form.html.erb | 2 ++ 1 file changed, 2 insertions(+) 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 6dec078c..f3d6ab6a 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 @@ -48,6 +48,8 @@ <% end %>
    + <% elsif current_user.admin? %> + <%= f.hidden_field :is_checked,:value => true%> <% end %>
    From b134e690e9440e1cad449794dfc1e923547a4556 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 15:57:17 +0800 Subject: [PATCH 053/125] Delete new_blog --- vendor/built_in_modules/new_blog/.gitignore | 6 - vendor/built_in_modules/new_blog/Gemfile | 16 - vendor/built_in_modules/new_blog/Gemfile.lock | 101 ------ vendor/built_in_modules/new_blog/MIT-LICENSE | 20 -- vendor/built_in_modules/new_blog/README.rdoc | 3 - vendor/built_in_modules/new_blog/Rakefile | 39 --- .../app/assets/images/new_blog/.gitkeep | 0 .../app/assets/javascripts/new_blog/.gitkeep | 0 .../app/assets/stylesheets/new_blog/.gitkeep | 0 .../stylesheets/new_blog/application.css | 7 - .../stylesheets/new_blog/production.css | 51 --- .../new_blog/app/controllers/.gitkeep | 0 .../app/controllers/application_controller.rb | 23 -- .../new_blog/back_end/posts_controller.rb | 84 ----- .../new_blog/front_end/comments_controller.rb | 7 - .../new_blog/front_end/posts_controller.rb | 13 - .../panel/new_blog/widget/posts_controller.rb | 12 - .../new_blog/app/helpers/.gitkeep | 0 .../app/helpers/application_helper.rb | 6 - .../new_blog/app/helpers/new_blog_helper.rb | 5 - .../new_blog/app/mailers/.gitkeep | 0 .../new_blog/app/models/.gitkeep | 0 .../new_blog/app/models/comment.rb | 7 - .../new_blog/app/models/post.rb | 10 - .../new_blog/app/views/.gitkeep | 0 .../app/views/layouts/application.html.erb | 14 - .../app/views/layouts/edit_view.html.erb | 14 - .../app/views/layouts/production.html.erb | 3 - .../new_blog/back_end/posts/_form.html.erb | 14 - .../new_blog/back_end/posts/edit.html.erb | 8 - .../new_blog/back_end/posts/index.html.erb | 33 -- .../back_end/posts/latest_post.html.erb | 5 - .../new_blog/back_end/posts/new.html.erb | 13 - .../new_blog/back_end/posts/show.html.erb | 38 -- .../front_end/posts/_post_frontend.html.erb | 29 -- .../new_blog/front_end/posts/index.html.erb | 14 - .../new_blog/front_end/posts/show.html.erb | 34 -- .../new_blog/widget/posts/index.html.erb | 16 - .../widget/posts/latest_post.html.erb | 7 - .../config/initializers/app_config.rb | 18 - .../new_blog/config/locales/en.yml | 129 ------- .../new_blog/config/locales/zh_tw.yml | 330 ------------------ .../new_blog/config/routes.rb | 20 -- .../built_in_modules/new_blog/lib/NewBlog.rb | 5 - .../new_blog/lib/new_blog/engine.rb | 5 - .../new_blog/lib/new_blog/version.rb | 3 - .../new_blog/lib/tasks/NewBlog_tasks.rake | 4 - .../new_blog/new_blog.gemspec | 23 -- .../built_in_modules/new_blog/new_blog.json | 12 - vendor/built_in_modules/new_blog/script/rails | 6 - .../new_blog/test/NewBlog_test.rb | 7 - .../new_blog/test/dummy/Rakefile | 7 - .../app/assets/javascripts/application.js | 9 - .../app/assets/stylesheets/application.css | 7 - .../app/controllers/application_controller.rb | 3 - .../dummy/app/helpers/application_helper.rb | 2 - .../new_blog/test/dummy/app/mailers/.gitkeep | 0 .../new_blog/test/dummy/app/models/.gitkeep | 0 .../app/views/layouts/application.html.erb | 14 - .../new_blog/test/dummy/config.ru | 4 - .../new_blog/test/dummy/config/application.rb | 46 --- .../new_blog/test/dummy/config/boot.rb | 10 - .../new_blog/test/dummy/config/database.yml | 25 -- .../new_blog/test/dummy/config/environment.rb | 5 - .../dummy/config/environments/development.rb | 27 -- .../dummy/config/environments/production.rb | 51 --- .../test/dummy/config/environments/test.rb | 39 --- .../initializers/backtrace_silencers.rb | 7 - .../dummy/config/initializers/inflections.rb | 10 - .../dummy/config/initializers/mime_types.rb | 5 - .../dummy/config/initializers/secret_token.rb | 7 - .../config/initializers/session_store.rb | 8 - .../config/initializers/wrap_parameters.rb | 14 - .../new_blog/test/dummy/config/locales/en.yml | 5 - .../new_blog/test/dummy/config/mongoid.yml | 1 - .../new_blog/test/dummy/config/routes.rb | 58 --- .../new_blog/test/dummy/lib/assets/.gitkeep | 0 .../new_blog/test/dummy/log/.gitkeep | 0 .../new_blog/test/dummy/public/404.html | 26 -- .../new_blog/test/dummy/public/422.html | 26 -- .../new_blog/test/dummy/public/500.html | 26 -- .../new_blog/test/dummy/public/favicon.ico | 0 .../new_blog/test/dummy/script/rails | 6 - .../test/integration/navigation_test.rb | 10 - .../new_blog/test/test_helper.rb | 10 - 85 files changed, 1682 deletions(-) delete mode 100644 vendor/built_in_modules/new_blog/.gitignore delete mode 100644 vendor/built_in_modules/new_blog/Gemfile delete mode 100644 vendor/built_in_modules/new_blog/Gemfile.lock delete mode 100644 vendor/built_in_modules/new_blog/MIT-LICENSE delete mode 100644 vendor/built_in_modules/new_blog/README.rdoc delete mode 100644 vendor/built_in_modules/new_blog/Rakefile delete mode 100644 vendor/built_in_modules/new_blog/app/assets/images/new_blog/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/app/assets/javascripts/new_blog/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/application.css delete mode 100644 vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/production.css delete mode 100644 vendor/built_in_modules/new_blog/app/controllers/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/app/controllers/application_controller.rb delete mode 100644 vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb delete mode 100644 vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/comments_controller.rb delete mode 100644 vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/posts_controller.rb delete mode 100644 vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb delete mode 100644 vendor/built_in_modules/new_blog/app/helpers/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/app/helpers/application_helper.rb delete mode 100644 vendor/built_in_modules/new_blog/app/helpers/new_blog_helper.rb delete mode 100644 vendor/built_in_modules/new_blog/app/mailers/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/app/models/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/app/models/comment.rb delete mode 100644 vendor/built_in_modules/new_blog/app/models/post.rb delete mode 100644 vendor/built_in_modules/new_blog/app/views/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/edit.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/_post_frontend.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/index.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb delete mode 100644 vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb delete mode 100644 vendor/built_in_modules/new_blog/config/initializers/app_config.rb delete mode 100644 vendor/built_in_modules/new_blog/config/locales/en.yml delete mode 100644 vendor/built_in_modules/new_blog/config/locales/zh_tw.yml delete mode 100644 vendor/built_in_modules/new_blog/config/routes.rb delete mode 100644 vendor/built_in_modules/new_blog/lib/NewBlog.rb delete mode 100644 vendor/built_in_modules/new_blog/lib/new_blog/engine.rb delete mode 100644 vendor/built_in_modules/new_blog/lib/new_blog/version.rb delete mode 100644 vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake delete mode 100644 vendor/built_in_modules/new_blog/new_blog.gemspec delete mode 100755 vendor/built_in_modules/new_blog/new_blog.json delete mode 100755 vendor/built_in_modules/new_blog/script/rails delete mode 100644 vendor/built_in_modules/new_blog/test/NewBlog_test.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/Rakefile delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config.ru delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/application.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/boot.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/database.yml delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/environment.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml delete mode 120000 vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/config/routes.rb delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/public/404.html delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/public/422.html delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/public/500.html delete mode 100644 vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico delete mode 100755 vendor/built_in_modules/new_blog/test/dummy/script/rails delete mode 100644 vendor/built_in_modules/new_blog/test/integration/navigation_test.rb delete mode 100644 vendor/built_in_modules/new_blog/test/test_helper.rb diff --git a/vendor/built_in_modules/new_blog/.gitignore b/vendor/built_in_modules/new_blog/.gitignore deleted file mode 100644 index 1463de6d..00000000 --- a/vendor/built_in_modules/new_blog/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.bundle/ -log/*.log -pkg/ -test/dummy/db/*.sqlite3 -test/dummy/log/*.log -test/dummy/tmp/ \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/Gemfile b/vendor/built_in_modules/new_blog/Gemfile deleted file mode 100644 index 52a1640b..00000000 --- a/vendor/built_in_modules/new_blog/Gemfile +++ /dev/null @@ -1,16 +0,0 @@ -source "http://rubygems.org" - -# Declare your gem's dependencies in NewBlog.gemspec. -# Bundler will treat runtime dependencies like base dependencies, and -# development dependencies will be added by default to the :development group. - -gem "mongoid" -gemspec - -# Declare any dependencies that are still in development here instead of in -# your gemspec. These might include edge Rails or gems from your path or -# Git. Remember to move these dependencies to your gemspec before releasing -# your gem to rubygems.org. - -# To use debugger -# gem 'ruby-debug19', :require => 'ruby-debug' diff --git a/vendor/built_in_modules/new_blog/Gemfile.lock b/vendor/built_in_modules/new_blog/Gemfile.lock deleted file mode 100644 index e986f6fe..00000000 --- a/vendor/built_in_modules/new_blog/Gemfile.lock +++ /dev/null @@ -1,101 +0,0 @@ -PATH - remote: . - specs: - NewBlog (0.0.1) - rails (~> 3.1.0.rc6) - -GEM - remote: http://rubygems.org/ - specs: - actionmailer (3.1.0) - actionpack (= 3.1.0) - mail (~> 2.3.0) - actionpack (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - builder (~> 3.0.0) - erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.0.3) - rack-mount (~> 0.8.2) - rack-test (~> 0.6.1) - sprockets (~> 2.0.0) - activemodel (3.1.0) - activesupport (= 3.1.0) - bcrypt-ruby (~> 3.0.0) - builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - arel (~> 2.2.1) - tzinfo (~> 0.3.29) - activeresource (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - activesupport (3.1.0) - multi_json (~> 1.0) - arel (2.2.1) - bcrypt-ruby (3.0.0) - bson (1.3.1) - builder (3.0.0) - erubis (2.7.0) - hike (1.2.1) - i18n (0.6.0) - mail (2.3.0) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.16) - mongo (1.3.1) - bson (>= 1.3.1) - mongoid (2.1.9) - activemodel (~> 3.0) - mongo (~> 1.3) - tzinfo (~> 0.3.22) - multi_json (1.0.3) - polyglot (0.3.2) - rack (1.3.2) - rack-cache (1.0.3) - rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) - rack (>= 1.0) - rails (3.1.0) - actionmailer (= 3.1.0) - actionpack (= 3.1.0) - activerecord (= 3.1.0) - activeresource (= 3.1.0) - activesupport (= 3.1.0) - bundler (~> 1.0) - railties (= 3.1.0) - railties (3.1.0) - actionpack (= 3.1.0) - activesupport (= 3.1.0) - rack-ssl (~> 1.3.2) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2) - rdoc (3.9.4) - sprockets (2.0.0) - hike (~> 1.2) - rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.29) - -PLATFORMS - ruby - -DEPENDENCIES - NewBlog! - mongoid diff --git a/vendor/built_in_modules/new_blog/MIT-LICENSE b/vendor/built_in_modules/new_blog/MIT-LICENSE deleted file mode 100644 index 80cf031a..00000000 --- a/vendor/built_in_modules/new_blog/MIT-LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright 2011 YOURNAME - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/built_in_modules/new_blog/README.rdoc b/vendor/built_in_modules/new_blog/README.rdoc deleted file mode 100644 index 4845c91f..00000000 --- a/vendor/built_in_modules/new_blog/README.rdoc +++ /dev/null @@ -1,3 +0,0 @@ -= NewBlog - -This project rocks and uses MIT-LICENSE. \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/Rakefile b/vendor/built_in_modules/new_blog/Rakefile deleted file mode 100644 index 01e88eef..00000000 --- a/vendor/built_in_modules/new_blog/Rakefile +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env rake -begin - require 'bundler/setup' -rescue LoadError - puts 'You must `gem install bundler` and `bundle install` to run rake tasks' -end -begin - require 'rdoc/task' -rescue LoadError - require 'rdoc/rdoc' - require 'rake/rdoctask' - RDoc::Task = Rake::RDocTask -end - -RDoc::Task.new(:rdoc) do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'NewBlog' - rdoc.options << '--line-numbers' - rdoc.rdoc_files.include('README.rdoc') - rdoc.rdoc_files.include('lib/**/*.rb') -end - -APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__) -load 'rails/tasks/engine.rake' - - -Bundler::GemHelper.install_tasks - -require 'rake/testtask' - -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.libs << 'test' - t.pattern = 'test/**/*_test.rb' - t.verbose = false -end - - -task :default => :test diff --git a/vendor/built_in_modules/new_blog/app/assets/images/new_blog/.gitkeep b/vendor/built_in_modules/new_blog/app/assets/images/new_blog/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/app/assets/javascripts/new_blog/.gitkeep b/vendor/built_in_modules/new_blog/app/assets/javascripts/new_blog/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/.gitkeep b/vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/application.css b/vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/application.css deleted file mode 100644 index 69b4b126..00000000 --- a/vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/application.css +++ /dev/null @@ -1,7 +0,0 @@ -/* - *This is a manifest file that'll automatically include all the stylesheets available in this directory - *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at - *the top of the compiled file, but it's generally better to create a new file per style scope. - *= require_self - *= require_tree . -*/ diff --git a/vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/production.css b/vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/production.css deleted file mode 100644 index cb83f05a..00000000 --- a/vendor/built_in_modules/new_blog/app/assets/stylesheets/new_blog/production.css +++ /dev/null @@ -1,51 +0,0 @@ -/* module */ -#module{ - float: left; - width: 170px; - margin-left: 20px; -} -.production { - padding: 10px; - font-size: 12px; - border: 1px solid #e1e1e1; - margin-bottom: 10px; - background: #DDDAD0; - color: #484339; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -moz-box-shadow: 0 0 5px #33322C; - -webkit-box-shadow: 0 0 5px #33322C; - box-shadow: 0 0 5px #33322C; - text-shadow: 0 1px 0 #fff; - line-height: 1.4; - font-family: Arial; -} -.production h2{ - font-size: 18px; - margin-bottom: 10px; - text-shadow: 0 1px 0 #fff; - border-left: 4px solid #B6300C; - line-height: 20px; - padding-left: 5px; -} -.production table{ - border: 1px solid #9b968c; - padding: 5px; - width: 145px; -} -.production th{ - background: #d3cfc3; - font-weight: bold; -} -.production th, .production tr, .production td{ - border: 1px solid #9b968c; - padding: 5px; -} -.production a{ - color: #9a460e; - text-decoration: none; -} -.production a:hover{ - text-decoration: underline; -} \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/app/controllers/.gitkeep b/vendor/built_in_modules/new_blog/app/controllers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/app/controllers/application_controller.rb b/vendor/built_in_modules/new_blog/app/controllers/application_controller.rb deleted file mode 100644 index 307a4acd..00000000 --- a/vendor/built_in_modules/new_blog/app/controllers/application_controller.rb +++ /dev/null @@ -1,23 +0,0 @@ -class ApplicationController < ActionController::Base - protect_from_forgery - before_filter :set_locale - - # Set I18n.locale - def set_locale - # update session if passed - session[:locale] = params[:locale] if params[:locale] - - # set locale based on session or default - begin - # check if locale is valid for non site pages - if !VALID_LOCALES.include?(session[:locale]) - I18n.locale = I18n.default_locale - else - I18n.locale = session[:locale] - end - rescue - I18n.locale = I18n.default_locale - end - end - -end diff --git a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb deleted file mode 100644 index c7a4151b..00000000 --- a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb +++ /dev/null @@ -1,84 +0,0 @@ -class Panel::NewBlog::BackEnd::PostsController < ApplicationController - - layout 'admin' - - def index - @posts = Post.all - - respond_to do |format| - format.html # index.html.erb - format.xml { render :xml => @posts } - end - end - - # GET /posts/1 - # GET /posts/1.xml - def show - @post = Post.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.xml { render :xml => @post } - end - end - - # GET /posts/new - # GET /posts/new.xml - def new - @post = Post.new - - respond_to do |format| - format.html # new.html.erb - format.xml { render :xml => @post } - end - end - - # GET /posts/1/edit - def edit - @post = Post.find(params[:id]) - end - - # POST /posts - # POST /posts.xml - def create - @post = Post.new(params[:post]) - - respond_to do |format| - if @post.save - format.html { redirect_to(panel_new_blog_post_url(@post), :notice => t('blog.create_post_success')) } - format.xml { render :xml => @post, :status => :created, :location => @post } - else - format.html { render :action => "new" } - format.xml { render :xml => @post.errors, :status => :unprocessable_entity } - end - end - end - - # PUT /posts/1 - # PUT /posts/1.xml - def update - @post = Post.find(params[:id]) - - respond_to do |format| - if @post.update_attributes(params[:post]) - format.html { redirect_to(panel_new_blog_post_url(@post), :notice => t('blog.update_post_success')) } - format.xml { head :ok } - else - format.html { render :action => "edit" } - format.xml { render :xml => @post.errors, :status => :unprocessable_entity } - end - end - end - - # DELETE /posts/1 - # DELETE /posts/1.xml - def destroy - @post = Post.find(params[:id]) - @post.destroy - - respond_to do |format| - format.html { redirect_to(panel_new_blog_posts_url) } - format.xml { head :ok } - end - end -end diff --git a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/comments_controller.rb b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/comments_controller.rb deleted file mode 100644 index 9bb61778..00000000 --- a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/comments_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Panel::NewBlog::FrontEnd::CommentsController < OrbitFrontendController - def create - @post = Post.find(params[:post_id]) - @comment = @post.comments.create!(params[:comment]) - redirect_to panel_new_blog_front_end_post_url(@post) - end -end \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/posts_controller.rb b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/posts_controller.rb deleted file mode 100644 index 48b0c1c5..00000000 --- a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/posts_controller.rb +++ /dev/null @@ -1,13 +0,0 @@ -class Panel::NewBlog::FrontEnd::PostsController < OrbitFrontendController - # GET /posts - # GET /posts.xml - def index - @posts = Post.all - end - - def show - @post = Post.find(params[:id]) - end - - -end diff --git a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb b/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb deleted file mode 100644 index 73098dda..00000000 --- a/vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb +++ /dev/null @@ -1,12 +0,0 @@ -class Panel::NewBlog::Widget::PostsController < OrbitWidgetController - # GET /posts - # GET /posts.xml - def index - @posts = Post.all - end - - def latest_post - @post = Post.all.last - end - -end diff --git a/vendor/built_in_modules/new_blog/app/helpers/.gitkeep b/vendor/built_in_modules/new_blog/app/helpers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/app/helpers/application_helper.rb b/vendor/built_in_modules/new_blog/app/helpers/application_helper.rb deleted file mode 100644 index 0d18e034..00000000 --- a/vendor/built_in_modules/new_blog/app/helpers/application_helper.rb +++ /dev/null @@ -1,6 +0,0 @@ -module ApplicationHelper - - def check_show_frontend - front_end_available(NewBlog::MOUDLEAPP_TITLE) - end -end diff --git a/vendor/built_in_modules/new_blog/app/helpers/new_blog_helper.rb b/vendor/built_in_modules/new_blog/app/helpers/new_blog_helper.rb deleted file mode 100644 index d8ad507e..00000000 --- a/vendor/built_in_modules/new_blog/app/helpers/new_blog_helper.rb +++ /dev/null @@ -1,5 +0,0 @@ -module NewBlogHelper - def self.check_show_frontend - ApplicationController.front_end_available(NewBlog::MOUDLEAPP_TITLE) - end -end \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/app/mailers/.gitkeep b/vendor/built_in_modules/new_blog/app/mailers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/app/models/.gitkeep b/vendor/built_in_modules/new_blog/app/models/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/app/models/comment.rb b/vendor/built_in_modules/new_blog/app/models/comment.rb deleted file mode 100644 index a85b7a43..00000000 --- a/vendor/built_in_modules/new_blog/app/models/comment.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Comment - include Mongoid::Document - include Mongoid::Timestamps - field :name, :type => String - field :body, :type => String - embedded_in :post, :inverse_of => :comments -end \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/app/models/post.rb b/vendor/built_in_modules/new_blog/app/models/post.rb deleted file mode 100644 index ef882a6d..00000000 --- a/vendor/built_in_modules/new_blog/app/models/post.rb +++ /dev/null @@ -1,10 +0,0 @@ -class Post - include Mongoid::Document - include Mongoid::Timestamps - include OrbitCoreLib::ObjectAuthable - - field :title, :type => String - field :body, :type => String - embeds_many :comments - validates_presence_of :title, :body -end \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/app/views/.gitkeep b/vendor/built_in_modules/new_blog/app/views/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb b/vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb deleted file mode 100644 index e8c46989..00000000 --- a/vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Blog - <%= stylesheet_link_tag :all %> - <%= javascript_include_tag :defaults %> - <%= csrf_meta_tag %> - - - -<%= yield %> - - - diff --git a/vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb b/vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb deleted file mode 100644 index 28bf833a..00000000 --- a/vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Blog - <%= stylesheet_link_tag :all %> - <%= javascript_include_tag :defaults %> - <%= csrf_meta_tag %> - - -
    - <%= yield %> -
    - - diff --git a/vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb b/vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb deleted file mode 100644 index d90a4112..00000000 --- a/vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -
    - <%= yield %> -
    diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb deleted file mode 100644 index 3c459566..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - <%= f.error_messages %> - -
    - <%= f.label :title %>
    - <%= f.text_field :title %> -
    -
    - <%= f.label :body %>
    - <%= f.text_area :body %> -
    -
    - <%= f.submit %> -
    diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/edit.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/edit.html.erb deleted file mode 100644 index 1b88113b..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/edit.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -

    <%= t('blog.editing_post') %>

    - -<%= form_for @post, :url => panel_new_blog_back_end_post_path(@post) do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> - -<%= link_to t('blog.show'), panel_new_blog_back_end_post_path(@post) %> | -<%= link_back %> diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb deleted file mode 100644 index 54ed9f1e..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb +++ /dev/null @@ -1,33 +0,0 @@ -<% content_for :secondary do %> -
      -
    • <%= link_to t('blog.new_post'), new_panel_new_blog_back_end_post_path, :class => 'seclink1' %>
      • -
    -<% end -%> - -<%= flash_messages %> - -

    <%= t('blog.list_post') %>

    - - - - - - - - - - -<% @posts.each do |post| %> - - - - - - - - -<% end %> -
    <%= t('blog.title') %><%= t('blog.body') %>
    <%= post.title %><%= truncate(post.body,:length=>15) %><%= link_to t('blog.new_auth'), init_admin_object_auths_path("Post",post) %><%= link_to t('blog.show'), panel_new_blog_back_end_post_path(post) %><%= link_to t('blog.edit'), edit_panel_new_blog_back_end_post_path(post) %><%= link_to t('blog.delete'), panel_new_blog_back_end_post_path(post), :confirm => t('blog.sure?'), :method => :delete %>
    - -
    - diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb deleted file mode 100644 index 65697a73..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<%=stylesheet_link_tag "new_blog/application"%> -

    <%=@post.title%>

    -

    - <%= @post.body%> -

    diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb deleted file mode 100644 index 21758da8..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -<% content_for :secondary do %> -
      -
    • <%= link_to t('blog.index'), panel_new_blog_back_end_posts_path, :class => 'seclink2' %>
      • -
    -<% end -%> - -<%= flash_messages %> -

    <%= t('blog.new_post') %>

    -<%= form_for @post, :url => panel_new_blog_back_end_posts_path do |f| %> - <%= f.text_field :title, :class => 'text' %> -<% end %> - -<%= link_back %> diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb deleted file mode 100644 index 3f7ebef4..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb +++ /dev/null @@ -1,38 +0,0 @@ -

    <%= flash_messages %>

    - -

    - <%= t('blog.body') %> - <%=h @post.body %> -

    - -

    <%= t('blog.comments') %>

    - -<% @post.comments.each do |c| %> -

    - <%=h c.name %> said:
    - <%= time_ago_in_words(c.created_at) %> ago -

    - -

    - <%=h c.body %> -

    -<% end %> - -<%= form_for Comment.new, :url => panel_new_blog_front_end_comments_path do |f| %> -

    - - <%= f.label :name, "Author" %>
    - <%= f.text_field :name %>
    - <%= f.label :body, "Comment Description" %>
    - <%= f.text_area :body %> - <%= hidden_field_tag :post_id, @post.id %> -

    - -

    - <%= f.submit "Add Comment" %> -

    -<% end %> - - -<%= link_to t('blog.edit'), edit_panel_new_blog_back_end_post_path(@post) %> | -<%= link_back %> \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/_post_frontend.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/_post_frontend.html.erb deleted file mode 100644 index b2a162c8..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/_post_frontend.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -
      -
    • -
      -

      <%=link_to post_frontend.title,panel_new_blog_front_end_post_path(post_frontend) %>

      -
      -
      - <%= truncate(post_frontend.body,:length=>100) %> -
      - -
      • -
    -
    - - - - - - - - - - - - - - - - - diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/index.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/index.html.erb deleted file mode 100644 index d28f49e7..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/index.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -<% content_for :secondary do %> -
      -
    • <%= link_to t('blog.new_post'), new_panel_new_blog_back_end_post_path, :class => 'seclink1' %>
      • -
    -<% end -%> - -<%= flash_messages %> - -

    <%= t('blog.front_end_index') %>

    - -
    - <%= render :partial => "post_frontend", :collection => @posts %> -
    - diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb deleted file mode 100644 index 50f8ef9e..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb +++ /dev/null @@ -1,34 +0,0 @@ -

    <%= flash_messages %>

    - -

    - <%= t('blog.body') %> - <%=h @post.body %> -

    - -

    <%= t('blog.comments') %>

    - -<% @post.comments.each do |c| %> -

    - <%=h c.name %> said:
    - <%= time_ago_in_words(c.created_at) %> ago -

    - -

    - <%=h c.body %> -

    -<% end %> - -<%= form_for Comment.new, :url => panel_new_blog_front_end_comments_path do |f| %> -

    - - <%= f.label :name, "Author" %>
    - <%= f.text_field :name %>
    - <%= f.label :body, "Comment Description" %>
    - <%= f.text_area :body %> - <%= hidden_field_tag :post_id, @post.id %> -

    - -

    - <%= f.submit "Add Comment" %> -

    -<% end %> diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb deleted file mode 100644 index 41c8ccf8..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -<%=stylesheet_link_tag "new_blog/application"%> -
    -
    TitleContentLink
    <%= post_frontend.title %><%= truncate(post_frontend.body,:length=>100) %><%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend), :class => 'btn' %>
    - - - - - - <% @posts.each do |post| %> - - - - - <% end %> -
    <%= t('blog.title') %><%= t('blog.body') %>
    <%= link_to post.title,panel_new_blog_front_end_post_path(post) %><%= post.body.truncate(14) %>
    -
    \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb deleted file mode 100644 index b4f62484..00000000 --- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%=stylesheet_link_tag "new_blog/application"%> -
    -

    <%= @post.title %>

    -

    - <%= @post.body %> -

    -
    \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/config/initializers/app_config.rb b/vendor/built_in_modules/new_blog/config/initializers/app_config.rb deleted file mode 100644 index 0e9f56e7..00000000 --- a/vendor/built_in_modules/new_blog/config/initializers/app_config.rb +++ /dev/null @@ -1,18 +0,0 @@ -# module NewBlog -# class MyEngine < Rails::Engine -# # Add a load path for this specific Engine -# # config.autoload_paths << File.expand_path("../lib/some/path", __FILE__) -# put "ABC" -# Orbit::Application::Orbit_Apps << "NewBlog" -# -# # initializer "my_engine.add_middleware" do |app| -# # app.middleware.use MyEngine::Middleware -# # end -# end -# -# end -module NewBlog - VERSION = "0.0.1" - MOUDLEAPP_TITLE = "NewBlog" -end -# Orbit::Application::Orbit_Apps << "NewBlog" \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/config/locales/en.yml b/vendor/built_in_modules/new_blog/config/locales/en.yml deleted file mode 100644 index 3c421024..00000000 --- a/vendor/built_in_modules/new_blog/config/locales/en.yml +++ /dev/null @@ -1,129 +0,0 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - -en: - - _locale: English - - add: Add - back: Back - create: Create - delete: Delete - disable: Disable - downloaded: Downloaded - download: Download - edit: Edit - enable: Enable - hide: Hide - homepage: Homepage - no_: "No" - nothing: Nothing - show: Show - sure?: Are you sure? - update: Update - yes_: "Yes" - - blog: - sure?: Sure? - - # admin: - # action: Action - # add_language: Add language - # admin: Admin - # action: Action - # announcement: Announcement - # asset: Asset - # attributes: Attributes - # cant_delete_self: You can not delete yourself. - # cant_revoke_self_admin: You can not revoke your admin role yourself. - # class: Class - # content: Content - # create_error_link: Error when creating link. - # create_error_page: Error when creating page. - # create_success_home: Homepage was successfully created. - # create_success_layout: Layout was successfully created. - # create_success_link: Link was successfully created. - # create_success_page: Page was successfully created. - # create_success_snippet: Snippet was successfully created. - # create_success_user: User was successfully created. - # data: Data - # delete_language: Delete language - # description: Description - # design: Design - # disable_language: Disable language - # editing_home: Editing homepage - # editing_layout: Editing layout - # editing_link: Editing link - # editing_page: Editing page - # editing_snippet: Editing snippet - # editing_user_info: Editing user information - # editing_user_role: Editing user role - # email: Email - # enable_language: Enable language - # file_name: Filename - # file_size: File size - # format: Format - # home: Home - # id: ID - # info: Information - # is_published: Is published - # item: Item - # key: Key - # language: Language - # layout: Layout - # layout_name: Layout name - # list_assets: Assets list - # list_designs: Designs list - # list_items: Items list - # list_puchases: Purchases list - # list_snippets: Snippets list - # list_users: Users list - # list_user_infos: User information list - # list_user_roles: User roles list - # member: Member - # move_down: Move down - # move_up: Move up - # multilingual: Multilingual - # my_avatar: My Avatar - # no_home_page: You don't have a homepage - # no_layout: You don't have a layout - # name: Name - # new_asset: New asset - # new_component: New component - # new_home: New homepage - # new_layout: New layout - # new_link: New link - # new_page: New page - # new_snippet: New snippet - # new_user: New user - # new_user_info: New user information - # new_user_role: New user role - # non_multilingual: Non multilingual - # options: Options - # orig_upload_file: Original filename - # position: Position - # published?: Published? - # purchase: Purchase - # registered: Registered - # role: Role - # roles: Roles - # title: Title - # translation: Translation - # type: Type - # up_to_date: Up-to-date - # update_error_link: Error when updating link. - # update_error_page: Error when updating page. - # update_success_content: Content was successfully updated. - # update_success_home: Homepage was successfully updated. - # update_success_layout: Layout was successfully updated. - # update_success_link: Link was successfully updated. - # update_success_page: Page was successfully updated. - # update_success_snippet: Snippet was successfully updated. - # update_success_user: User was successfully updated. - # url: URL - # user: User - # user_info: User information - # user_panel: User panel - # user_role: User role - - panel: diff --git a/vendor/built_in_modules/new_blog/config/locales/zh_tw.yml b/vendor/built_in_modules/new_blog/config/locales/zh_tw.yml deleted file mode 100644 index 4ef309e6..00000000 --- a/vendor/built_in_modules/new_blog/config/locales/zh_tw.yml +++ /dev/null @@ -1,330 +0,0 @@ -zh_tw: - - _locale: 銝剜 - - add: 啣 - back: - create: 菟 - delete: 芷 - disable: 蝳 - edit: 蝺刻摩 - enable: - hide: 梯 - homepage: 擐 - no_: "No" - nothing: - show: 憿舐內 - sure?: 刻臬? - update: 湔 - yes_: "Yes" - - admin: - action: 銵 - add_language: 啣隤閮 - admin: 蝞∠ - action: 銵 - announcement: 砍 - asset: 鞈 - attributes: 撅祆 - cant_delete_self: 其臭誑芷方芸楛 - cant_revoke_self_admin: 其臭誑日瑁芸楛蝞∠雿具 - class: 蝝 - content: 批捆 - create_error_link: 萄遣交粹胯 - create_error_page: 萄遣Ｘ粹胯 - create_success_home: 擐撌脫萄遣 - create_success_layout: 璅踹歇萄遣 - create_success_link: 蝯撌脫萄遣 - create_success_page: Ｗ歇萄遣 - create_success_snippet: 畾萄歇萄遣 - create_success_user: 冽嗅歇萄遣 - data: 豢 - delete_language: 芷方閮 - description: 餈 - disable_language: 蝳刻閮 - editing_home: 蝺刻摩擐 - editing_layout: 蝺刻摩璅 - editing_link: 蝺刻摩蝯 - editing_page: 蝺刻摩 - editing_snippet: 蝺刻摩畾 - editing_user_info: 蝺刻摩冽嗉 - editing_user_role: 蝺刻摩冽嗉 - email: Email - enable_language: 刻閮 - file_name: 瑼 - file_size: 瑼獢憭批 - format: 澆 - home: 擐 - id: ID - info: 鞈 - is_published: 鋡怠箇 - item: - key: - language: 隤閮 - layout: 雿撅 - layout_name: 雿撅摮 - list_assets: 鞈Ｘ - list_items: 格 - list_layouts: 雿撅皜 - list_snippets: 瑞皜 - list_users: 雿輻冽 - list_user_infos: 冽嗉皜 - list_user_roles: 冽嗉脫 - member: - move_down: 敺銝蝘 - move_up: 敺銝蝘 - multilingual: 憭蝔株閮 - my_avatar: 剖 - no_home_page: 冽擐 - no_layout: 冽雿撅 - name: 蝔 - new_asset: 啣鞈 - new_component: 啣隞 - new_home: 啣擐 - new_layout: 啣璅 - new_link: 啣蝯 - new_page: 啣 - new_snippet: 啣畾 - new_user: 啣雿輻 - new_user_info: 啣冽嗉 - new_user_role: 啣冽嗉 - non_multilingual: 憭蝔株閮 - options: 賊 - orig_upload_file: 銝單 - position: 雿蝵 - published?: 澆? - role: 閫 - roles: 閫脯 - title: 璅憿 - translation: 蝧餉陌 - type: 憿 - update_error_link: 湔圈交箇暸航炊 - update_error_page: 湔圈Ｘ箇暸航炊 - update_success_content: 批捆撌脫湔啜 - update_success_home: 擐撌脫湔啜 - update_success_layout: 璅踹歇湔啜 - update_success_link: 蝯撌脫湔啜 - update_success_page: Ｗ歇湔啜 - update_success_snippet: 畾萄歇湔啜 - update_success_user: 冽嗅歇湔 - url: URL - user: 冽 - user_info: 冽嗉 - user_panel: 冽園Ｘ - user_role: 冽嗉 - - panel: - - - -# Chinese (Taiwan) translations for Ruby on Rails -# by tsechingho (http://github.com/tsechingho) - date: - formats: - default: "%Y-%m-%d" - short: "%b%d" - long: "%Y撟%b%d" - day_names: [, 銝, 鈭, 銝, , 鈭, 苗 - abbr_day_names: [, 銝, 鈭, 銝, , 鈭, 苗 - month_names: [~, 銝, 鈭, 銝, , 鈭, 剜, 銝, 急, 銋, , 銝, 鈭] - abbr_month_names: [~, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - order: [ :year, :month, :day ] - - time: - formats: - default: "%Y撟%b%d %A %H:%M:%S %Z" - short: "%b%d %H:%M" - long: "%Y撟%b%d %H:%M" - am: "銝" - pm: "銝" - - datetime: - distance_in_words: - half_a_minute: "" - less_than_x_seconds: - one: "銝唬蝘" - other: "銝 %{count} 蝘" - x_seconds: - one: "銝蝘" - other: "%{count} 蝘" - less_than_x_minutes: - one: "銝唬" - other: "銝 %{count} " - x_minutes: - one: "銝" - other: "%{count} " - about_x_hours: - one: "憭抒銝撠" - other: "憭抒 %{count} 撠" - x_days: - one: "銝憭" - other: "%{count} 憭" - about_x_months: - one: "憭抒銝" - other: "憭抒 %{count} " - x_months: - one: "銝" - other: "%{count} " - about_x_years: - one: "憭抒銝撟" - other: "憭抒 %{count} 撟" - over_x_years: - one: "銝撟游" - other: "%{count} 撟游" - almost_x_years: - one: "亥銝撟" - other: "亥 %{count} 撟" - prompts: - year: "撟" - month: "" - day: "" - hour: "" - minute: "" - second: "蝘" - - number: - format: - separator: "." - delimiter: "," - precision: 3 - significant: false - strip_insignificant_zeros: false - currency: - format: - format: "%u %n" - unit: "NT$" - separator: "." - delimiter: "," - precision: 2 - significant: false - strip_insignificant_zeros: false - percentage: - format: - delimiter: "" - precision: - format: - delimiter: "" - human: - format: - delimiter: "" - precision: 1 - significant: false - strip_insignificant_zeros: false - storage_units: - format: "%n %u" - units: - byte: - one: "Byte" - other: "Bytes" - kb: "KB" - mb: "MB" - gb: "GB" - tb: "TB" - decimal_units: - format: "%n %u" - units: - # 10^-21 zepto, 10^-24 yocto - atto: "皜" # 10^-18 - femto: "憌" # 10^-15 瘥怠凝敺 - pico: "瞍" # 10^-12 敺桀凝 - nano: "憟" # 10^-9 瘥怠凝 - micro: "敺" # 10^-6 - mili: "瘥" # 10^-3 milli - centi: "" # 10^-2 - deci: "" # 10^-1 - unit: "" - ten: - one: "" - other: "" # 10^1 - hundred: "" # 10^2 - thousand: "" # 10^3 kilo - million: "曇" # 10^6 mega - billion: "" # 10^9 giga - trillion: "" # 10^12 tera - quadrillion: "" # 10^15 peta - # 10^18 exa, 10^21 zetta, 10^24 yotta - - support: - array: - words_connector: ", " - two_words_connector: " " - last_word_connector: ", " - select: - prompt: "隢豢" - - activerecord: - errors: - template: # ~ 2.3.5 backward compatible - header: - one: " 1 航炊潛雿踹%{model}⊥鋡怠脣" - other: " %{count} 航炊潛雿踹%{model}⊥鋡怠脣" - body: "隞乩甈雿潛憿嚗" - full_messages: - format: "%{attribute} %{message}" - messages: - inclusion: "瘝怠典銵其葉" - exclusion: "航◤靽萄" - invalid: "舐⊥" - confirmation: "銝蝚血蝣箄" - accepted: "敹臬航◤亙" - empty: "銝賜蝛" - blank: "銝賣舐征賢" - too_long: "瘀瑟 %{count} 摮嚗" - too_short: "哨剜 %{count} 摮嚗" - wrong_length: "摮賊航炊嚗敹 %{count} 摮嚗" - not_a_number: "銝舀詨" - not_an_integer: "敹舀湔" - greater_than: "敹憭扳 %{count}" - greater_than_or_equal_to: "敹憭扳潭蝑 %{count}" - equal_to: "敹蝑 %{count}" - less_than: "敹撠 %{count}" - less_than_or_equal_to: "敹撠潭蝑 %{count}" - odd: "敹臬" - even: "敹臬嗆" - taken: "撌脩鋡思蝙" - record_invalid: "⊿憭望: %{errors}" - - activemodel: - errors: - template: - header: - one: " 1 航炊潛雿踹%{model}⊥鋡怠脣" - other: " %{count} 航炊潛雿踹%{model}⊥鋡怠脣" - body: "隞乩甈雿潛憿嚗" - - errors: - format: "%{attribute} %{message}" - messages: - inclusion: "瘝怠典銵其葉" - exclusion: "航◤靽萄" - invalid: "舐⊥" - confirmation: "銝蝚血蝣箄" - accepted: "敹臬航◤亙" - empty: "銝賜蝛" - blank: "銝賣舐征賢" - too_long: "瘀瑟 %{count} 摮嚗" - too_short: "哨剜 %{count} 摮嚗" - wrong_length: "摮賊航炊嚗敹 %{count} 摮嚗" - not_a_number: "銝舀詨" - not_an_integer: "敹舀湔" - greater_than: "敹憭扳 %{count}" - greater_than_or_equal_to: "敹憭扳潭蝑 %{count}" - equal_to: "敹蝑 %{count}" - less_than: "敹撠 %{count}" - less_than_or_equal_to: "敹撠潭蝑 %{count}" - odd: "敹臬" - even: "敹臬嗆" - template: - header: - one: " 1 航炊潛雿踹%{model}⊥鋡怠脣" - other: " %{count} 航炊潛雿踹%{model}⊥鋡怠脣" - body: "隞乩甈雿潛憿嚗" - - helpers: - select: - prompt: "隢豢" - submit: - create: "啣%{model}" - update: "湔%{model}" - submit: "脣%{model}" - diff --git a/vendor/built_in_modules/new_blog/config/routes.rb b/vendor/built_in_modules/new_blog/config/routes.rb deleted file mode 100644 index a756677e..00000000 --- a/vendor/built_in_modules/new_blog/config/routes.rb +++ /dev/null @@ -1,20 +0,0 @@ -Rails.application.routes.draw do - namespace :panel do - namespace :new_blog do - namespace :back_end do - root :to => "posts#index" - resources :posts - resources :comments - end - namespace :front_end do - root :to => "posts#index" - resources :posts - resources :comments - end - namespace :widget do - match "posts" => "posts#index" - match "latest_post" => "posts#latest_post" - end - end - end -end diff --git a/vendor/built_in_modules/new_blog/lib/NewBlog.rb b/vendor/built_in_modules/new_blog/lib/NewBlog.rb deleted file mode 100644 index 4b74cf74..00000000 --- a/vendor/built_in_modules/new_blog/lib/NewBlog.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "new_blog/engine" - - -module NewBlog -end diff --git a/vendor/built_in_modules/new_blog/lib/new_blog/engine.rb b/vendor/built_in_modules/new_blog/lib/new_blog/engine.rb deleted file mode 100644 index 6879f112..00000000 --- a/vendor/built_in_modules/new_blog/lib/new_blog/engine.rb +++ /dev/null @@ -1,5 +0,0 @@ -module NewBlog - class Engine < Rails::Engine - isolate_namespace new_blog - end -end diff --git a/vendor/built_in_modules/new_blog/lib/new_blog/version.rb b/vendor/built_in_modules/new_blog/lib/new_blog/version.rb deleted file mode 100644 index 9690b537..00000000 --- a/vendor/built_in_modules/new_blog/lib/new_blog/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -module NewBlog - VERSION = "0.0.1" -end diff --git a/vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake b/vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake deleted file mode 100644 index 0975b49b..00000000 --- a/vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake +++ /dev/null @@ -1,4 +0,0 @@ -# desc "Explaining what the task does" -# task :NewBlog do -# # Task goes here -# end diff --git a/vendor/built_in_modules/new_blog/new_blog.gemspec b/vendor/built_in_modules/new_blog/new_blog.gemspec deleted file mode 100644 index 93e5b31d..00000000 --- a/vendor/built_in_modules/new_blog/new_blog.gemspec +++ /dev/null @@ -1,23 +0,0 @@ -$:.push File.expand_path("../lib", __FILE__) - -# Maintain your gem's version: -require "NewBlog/version" - -# Describe your gem and declare its dependencies: -Gem::Specification.new do |s| - s.name = "NewBlog" - s.version = NewBlog::VERSION - s.authors = ["TODO: Your name"] - s.email = ["TODO: Your email"] - s.homepage = "TODO" - s.summary = "TODO: Summary of NewBlog." - s.description = "TODO: Description of NewBlog." - - s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"] - s.test_files = Dir["test/**/*"] - - s.add_dependency "rails", "~> 3.1.0.rc6" - # s.add_dependency "jquery-rails" - - #s.add_development_dependency "sqlite3" -end diff --git a/vendor/built_in_modules/new_blog/new_blog.json b/vendor/built_in_modules/new_blog/new_blog.json deleted file mode 100755 index cacca953..00000000 --- a/vendor/built_in_modules/new_blog/new_blog.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "title": "new_blog", - "version": "0.1", - "organization": "Rulingcom", - "author": "RD dep", - "intro": "A simple blog色", - "update_info": "Some info", - "create_date": "11-11-2011", - "app_pages": ["posts"], - "widgets": ["latest_post","posts"], - "enable_frontend": true -} diff --git a/vendor/built_in_modules/new_blog/script/rails b/vendor/built_in_modules/new_blog/script/rails deleted file mode 100755 index e323e44b..00000000 --- a/vendor/built_in_modules/new_blog/script/rails +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env ruby -#!/usr/bin/env ruby -# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. - -ENGINE_PATH = File.expand_path('../..', __FILE__) -load File.expand_path('../../test/dummy/script/rails', __FILE__) diff --git a/vendor/built_in_modules/new_blog/test/NewBlog_test.rb b/vendor/built_in_modules/new_blog/test/NewBlog_test.rb deleted file mode 100644 index 2870704b..00000000 --- a/vendor/built_in_modules/new_blog/test/NewBlog_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class NewBlogTest < ActiveSupport::TestCase - test "truth" do - assert_kind_of Module, NewBlog - end -end diff --git a/vendor/built_in_modules/new_blog/test/dummy/Rakefile b/vendor/built_in_modules/new_blog/test/dummy/Rakefile deleted file mode 100644 index 36458522..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/Rakefile +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env rake -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - -require File.expand_path('../config/application', __FILE__) - -Dummy::Application.load_tasks diff --git a/vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js b/vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js deleted file mode 100644 index 37c7bfcd..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js +++ /dev/null @@ -1,9 +0,0 @@ -// This is a manifest file that'll be compiled into including all the files listed below. -// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically -// be included in the compiled file accessible from http://example.com/assets/application.js -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// the compiled file. -// -//= require jquery -//= require jquery_ujs -//= require_tree . diff --git a/vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css b/vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css deleted file mode 100644 index fc25b572..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css +++ /dev/null @@ -1,7 +0,0 @@ -/* - * This is a manifest file that'll automatically include all the stylesheets available in this directory - * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at - * the top of the compiled file, but it's generally better to create a new file per style scope. - *= require_self - *= require_tree . -*/ \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb b/vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb deleted file mode 100644 index e8065d95..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationController < ActionController::Base - protect_from_forgery -end diff --git a/vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb b/vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb deleted file mode 100644 index de6be794..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep b/vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep b/vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb b/vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb deleted file mode 100644 index 9a8a761b..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Dummy - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - - - -<%= yield %> - - - diff --git a/vendor/built_in_modules/new_blog/test/dummy/config.ru b/vendor/built_in_modules/new_blog/test/dummy/config.ru deleted file mode 100644 index 1989ed8d..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config.ru +++ /dev/null @@ -1,4 +0,0 @@ -# This file is used by Rack-based servers to start the application. - -require ::File.expand_path('../config/environment', __FILE__) -run Dummy::Application diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/application.rb b/vendor/built_in_modules/new_blog/test/dummy/config/application.rb deleted file mode 100644 index 5e17b68c..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/application.rb +++ /dev/null @@ -1,46 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -require "action_controller/railtie" -require "action_mailer/railtie" -require "active_resource/railtie" -require "rails/test_unit/railtie" -require "sprockets/railtie" # Uncomment this line for Rails 3.1+ - -Bundler.require -require "NewBlog" - -module Dummy - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Custom directories with classes and modules you want to be autoloadable. - # config.autoload_paths += %W(#{config.root}/extras) - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named. - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Activate observers that should always be running. - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - - # Configure the default encoding used in templates for Ruby 1.9. - config.encoding = "utf-8" - - # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password] - - # Enable the asset pipeline - config.assets.enabled = true - end -end - diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/boot.rb b/vendor/built_in_modules/new_blog/test/dummy/config/boot.rb deleted file mode 100644 index eba06813..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/boot.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'rubygems' -gemfile = File.expand_path('../../../../Gemfile', __FILE__) - -if File.exist?(gemfile) - ENV['BUNDLE_GEMFILE'] = gemfile - require 'bundler' - Bundler.setup -end - -$:.unshift File.expand_path('../../../../lib', __FILE__) \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/database.yml b/vendor/built_in_modules/new_blog/test/dummy/config/database.yml deleted file mode 100644 index 51a4dd45..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/environment.rb b/vendor/built_in_modules/new_blog/test/dummy/config/environment.rb deleted file mode 100644 index 3da5eb91..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the rails application -require File.expand_path('../application', __FILE__) - -# Initialize the rails application -Dummy::Application.initialize! diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb b/vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb deleted file mode 100644 index 1f1595dc..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb +++ /dev/null @@ -1,27 +0,0 @@ -Dummy::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false - - # Print deprecation notices to the Rails logger - config.active_support.deprecation = :log - - # Only use best-standards-support built into browsers - config.action_dispatch.best_standards_support = :builtin - - # Do not compress assets - config.assets.compress = false -end diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb b/vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb deleted file mode 100644 index 67a50850..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb +++ /dev/null @@ -1,51 +0,0 @@ -Dummy::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # Code is not reloaded between requests - config.cache_classes = true - - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_assets = false - - # Compress JavaScripts and CSS - config.assets.compress = true - - # Specifies the header that your server uses for sending files - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # See everything in the log (default is :info) - # config.log_level = :debug - - # Use a different logger for distributed setups - # config.logger = SyslogLogger.new - - # Use a different cache store in production - # config.cache_store = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" - - # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) - # config.assets.precompile += %w( search.js ) - - # Disable delivery errors, bad email addresses will be ignored - # config.action_mailer.raise_delivery_errors = false - - # Enable threaded mode - # config.threadsafe! - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners - config.active_support.deprecation = :notify -end diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb b/vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb deleted file mode 100644 index 6810c914..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb +++ /dev/null @@ -1,39 +0,0 @@ -Dummy::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # The test environment is used exclusively to run your application's - # test suite. You never need to work with it otherwise. Remember that - # your test database is "scratch space" for the test suite and is wiped - # and recreated between test runs. Don't rely on the data there! - config.cache_classes = true - - # Configure static asset server for tests with Cache-Control for performance - config.serve_static_assets = true - config.static_cache_control = "public, max-age=3600" - - # Log error messages when you accidentally call methods on nil - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Raise exceptions instead of rendering exception templates - config.action_dispatch.show_exceptions = false - - # Disable request forgery protection in test environment - config.action_controller.allow_forgery_protection = false - - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test - - # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql - - # Print deprecation notices to the stderr - config.active_support.deprecation = :stderr -end diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb b/vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb b/vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb deleted file mode 100644 index 9e8b0131..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format -# (all these examples are active by default): -# ActiveSupport::Inflector.inflections do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb b/vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e4..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb b/vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb deleted file mode 100644 index 500605a4..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -Dummy::Application.config.secret_token = 'd50c02c22eac460faa82296161da6222762a7baff08669429b7b14b1e80b33f14cf1e1f8daf99486dda3b4d281c73b835169269a121027552299286a818c7d03' diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb b/vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb deleted file mode 100644 index 952473ff..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Dummy::Application.config.session_store :cookie_store, key: '_dummy_session' - -# Use the database for sessions instead of the cookie-based default, -# which shouldn't be used to store highly confidential information -# (create the session table with "rails generate session_migration") -# Dummy::Application.config.session_store :active_record_store diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb b/vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb deleted file mode 100644 index 999df201..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] -end - -# Disable root element in JSON by default. -ActiveSupport.on_load(:active_record) do - self.include_root_in_json = false -end diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml b/vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml deleted file mode 100644 index 179c14ca..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - -en: - hello: "Hello world" diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml b/vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml deleted file mode 120000 index 75196a04..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../orbit/config/mongoid.yml \ No newline at end of file diff --git a/vendor/built_in_modules/new_blog/test/dummy/config/routes.rb b/vendor/built_in_modules/new_blog/test/dummy/config/routes.rb deleted file mode 100644 index bb509f27..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/config/routes.rb +++ /dev/null @@ -1,58 +0,0 @@ -Dummy::Application.routes.draw do - # The priority is based upon order of creation: - # first created -> highest priority. - - # Sample of regular route: - # match 'products/:id' => 'catalog#view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Sample resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Sample resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Sample resource route with more complex sub-resources - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', :on => :collection - # end - # end - - # Sample resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end - - # You can have the root of your site routed with "root" - # just remember to delete public/index.html. - # root :to => 'welcome#index' - - # See how all your routes lay out with "rake routes" - - # This is a legacy wild controller route that's not recommended for RESTful applications. - # Note: This route will make all actions in every controller accessible via GET requests. - # match ':controller(/:action(/:id(.:format)))' -end diff --git a/vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep b/vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep b/vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/test/dummy/public/404.html b/vendor/built_in_modules/new_blog/test/dummy/public/404.html deleted file mode 100644 index 9a48320a..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/public/404.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - The page you were looking for doesn't exist (404) - - - - - -
    -

    The page you were looking for doesn't exist.

    -

    You may have mistyped the address or the page may have moved.

    -
    - - diff --git a/vendor/built_in_modules/new_blog/test/dummy/public/422.html b/vendor/built_in_modules/new_blog/test/dummy/public/422.html deleted file mode 100644 index 83660ab1..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/public/422.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - The change you wanted was rejected (422) - - - - - -
    -

    The change you wanted was rejected.

    -

    Maybe you tried to change something you didn't have access to.

    -
    - - diff --git a/vendor/built_in_modules/new_blog/test/dummy/public/500.html b/vendor/built_in_modules/new_blog/test/dummy/public/500.html deleted file mode 100644 index b80307fc..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/public/500.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - We're sorry, but something went wrong (500) - - - - - -
    -

    We're sorry, but something went wrong.

    -

    We've been notified about this issue and we'll take a look at it shortly.

    -
    - - diff --git a/vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico b/vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/built_in_modules/new_blog/test/dummy/script/rails b/vendor/built_in_modules/new_blog/test/dummy/script/rails deleted file mode 100755 index f8da2cff..00000000 --- a/vendor/built_in_modules/new_blog/test/dummy/script/rails +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env ruby -# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. - -APP_PATH = File.expand_path('../../config/application', __FILE__) -require File.expand_path('../../config/boot', __FILE__) -require 'rails/commands' diff --git a/vendor/built_in_modules/new_blog/test/integration/navigation_test.rb b/vendor/built_in_modules/new_blog/test/integration/navigation_test.rb deleted file mode 100644 index 97a94c9b..00000000 --- a/vendor/built_in_modules/new_blog/test/integration/navigation_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'test_helper' - -class NavigationTest < ActionDispatch::IntegrationTest - fixtures :all - - # test "the truth" do - # assert true - # end -end - diff --git a/vendor/built_in_modules/new_blog/test/test_helper.rb b/vendor/built_in_modules/new_blog/test/test_helper.rb deleted file mode 100644 index dcd3b276..00000000 --- a/vendor/built_in_modules/new_blog/test/test_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Configure Rails Environment -ENV["RAILS_ENV"] = "test" - -require File.expand_path("../dummy/config/environment.rb", __FILE__) -require "rails/test_help" - -Rails.backtrace_cleaner.remove_silencers! - -# Load support files -Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } From d02bbdbaa5a49e39c8fc8f6ce56871db0ac8b423 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 17:57:50 +0800 Subject: [PATCH 054/125] Nokogiri in parsers --- app/views/admin/pages/_show.html.erb | 6 +- lib/parsers/parser_back_end.rb | 190 ++++++++++----------------- lib/parsers/parser_common.rb | 52 ++++++++ lib/parsers/parser_front_end.rb | 183 +++++--------------------- 4 files changed, 162 insertions(+), 269 deletions(-) diff --git a/app/views/admin/pages/_show.html.erb b/app/views/admin/pages/_show.html.erb index 1937fe92..ba9bcf48 100644 --- a/app/views/admin/pages/_show.html.erb +++ b/app/views/admin/pages/_show.html.erb @@ -1,3 +1,7 @@ <%= flash_messages %> -<%= parse_page_edit(@item).html_safe %> \ No newline at end of file + +<%= page_stylesheets(@item).html_safe %> +<%= page_javascripts(@item).html_safe %> + +<%= parse_page_edit_noko(@item).html_safe %> \ No newline at end of file diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb index 787f579b..3e641118 100644 --- a/lib/parsers/parser_back_end.rb +++ b/lib/parsers/parser_back_end.rb @@ -1,132 +1,86 @@ module ParserBackEnd - require 'radius' include ParserCommon - - def parse_page_edit(page) - if page._type == 'Page' - layout_content = page.design.layout.content.force_encoding('UTF-8') rescue '' - context = parser_context_edit(page) - parser = Radius::Parser.new(context, :tag_prefix => 'r') - parser.parse(parser.parse(layout_content)) + + require 'nokogiri' + + # c.define_tag 'language_bar' do + # @site.in_use_locales.map{ |locale| + # lang = I18nVariable.first(:conditions => {:key => locale})[locale] + # if I18n.locale.to_s.eql?(locale) + # lang + # else + # "#{lang}" + # end + # }.join(' | ') + # end + # c.define_tag 'link' do |tag| + # item = Item.first(:conditions => { :full_name => tag.attr['name'] }) + # ret = '' + # ret << "" + # ret << item.i18n_variable[I18n.locale] + # ret << "" + # end + + def parse_page_edit_noko(page, id = nil) + body = Nokogiri::HTML(page.design.layout.body) + parse_menu(body, page, true) + public_r_tags = parse_contents(body, page, id) + parse_images(body, page) + + public_r_tags.each do |tag| + send("parse_#{tag}s", body, page,id) end + + body.to_html end - - def parser_context_edit(page, attributes = {}) - Radius::Context.new do |c| - c.define_tag 'ad_banner' do |tag| - res = '' - ad_banner = AdBanner.find(tag.attr["id"]) rescue nil - if ad_banner - res << "" - res << "
    " - ad_banner.ad_images.each do |ad_image| - res << "" - end - res << "
    " - end - end - c.define_tag 'content' do |tag| - ret = '' - if (tag.attributes["main"] == "true" && !page.module_app.nil?) - ret << "
    " - else - part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } - ret << "
    " - ret << "' - case part.kind - when 'text' - ret << part.i18n_variable[I18n.locale] rescue '' - when 'module_widget' - if part[:category] - ret << "
    " - else - ret << "
    " - end - when 'public_r_tag' - ret << "" - else - '' - end - ret << '
    ' - end - end - c.define_tag 'image' do |tag| - # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } - # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - if image - res = "' - end - end - c.define_tag 'javascripts' do |tag| - res = '' - res << "" - res << "" - res << "" - res << "" - page.design.javascripts.each do |js| - res << "" - end - res - end - c.define_tag 'language_bar' do - @site.in_use_locales.map{ |locale| - lang = I18nVariable.first(:conditions => {:key => locale})[locale] - if I18n.locale.to_s.eql?(locale) - lang + + # page_contents + def parse_contents(body, page, id) + public_r_tags = [] + body.css('.page_content').each do |content| + ret = '' + if (content["main"] == "true" && !page.module_app.nil?) + ret << "
    " + else + part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil + ret << "
    " + ret << "' + case part.kind + when 'text' + ret << part.i18n_variable[I18n.locale] rescue '' + when 'module_widget' + if part[:category] + ret << "
    " else - "#{lang}" + ret << "
    " end - }.join(' | ') + when 'public_r_tag' + ret << "" + public_r_tags << part.public_r_tag + else + '' + end end - c.define_tag 'link' do |tag| - item = Item.first(:conditions => { :full_name => tag.attr['name'] }) - ret = '' - ret << "" - ret << item.i18n_variable[I18n.locale] - ret << "" - end - c.define_tag 'menu' do |tag| - home = get_homepage - menu = page.design.layout.menu - menu_level(home, 0, menu, true) - end - c.define_tag 'meta' do |tag| - "" - end - c.define_tag 'stylesheets' do |tag| - res = '' - res << "" if page.design.reset_css - res << "" if page.design.default_css - theme = page.design.themes.detect{ |d| d.id == page.theme_id } - res << "" if theme - res - end - c.define_tag 'title' do |tag| - "#{page.title ? page.title : page.i18n_variable[I18n.locale]}" + scope = "<#{content.name}" + content.attributes.each_pair do |key, value| + scope << " #{key}='#{value}'" end + scope << ">#{ret}" + fragment = Nokogiri::HTML::DocumentFragment.new(body, scope) + content.swap(fragment) end + public_r_tags.uniq end - + + def self.included(base) - base.send :helper_method, :parse_page_edit if base.respond_to? :helper_method + base.send :helper_method, :parse_page_edit_noko if base.respond_to? :helper_method end end diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 8d43c070..96cbb4b9 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -44,4 +44,56 @@ module ParserCommon res << "" end + # ad_banners + def parse_ad_banners(body = nil, page = nil, id = nil) + body.css('ad_banner').each do |banner| + res = '' + ad_banner = AdBanner.find(banner["id"]) rescue nil + if ad_banner && ad_banner.display? + res << "" + res << "
    " + ad_banner.ad_images.each do |ad_image| + res << "" + end + res << "
    " + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, res) + banner.swap(fragment) + end + end + + # page_images + def parse_images(body, page) + body.css('.page_image').each do |page_image| + # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } + # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image + image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image + if image + res = "' + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, res) + page_image.swap(fragment) + end + end + + # page_menu + def parse_menu(body, page, edit=nil) + page_menu = body.css('.page_menu').first + home = get_homepage + menu = page.design.layout.menu + fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu, true)) + page_menu.swap(fragment) + end + end diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 529802ff..c3ca1787 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -1,113 +1,42 @@ module ParserFrontEnd - require 'radius' include ParserCommon - - def parser_context(page, attributes = {}, id = nil) - Radius::Context.new do |c| - c.define_tag 'ad_banner' do |tag| - res = '' - ad_banner = AdBanner.find(tag.attr["id"]) rescue nil - if ad_banner && ad_banner.display? - res << "" - res << "
    " - ad_banner.ad_images.each do |ad_image| - res << "" - end - res << "
    " - end - res - end - c.define_tag 'content' do |tag| - ret = '' - if (tag.attributes["main"] == "true" && !page.module_app.nil?) - ret << "
    " - else - part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil - case part.kind - when 'text' - ret << part.i18n_variable[I18n.locale] rescue '' - when 'module_widget' - if part[:category] - ret << "
    " - else - ret << "
    " - end - when 'public_r_tag' - ret << "" - else - '' - end - end - ret - end - c.define_tag 'image' do |tag| - # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } - # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - if image - res = "' - end - end - c.define_tag 'language_bar' do - @site.in_use_locales.map{ |locale| - lang = I18nVariable.first(:conditions => {:key => locale})[locale] - if I18n.locale.to_s.eql?(locale) - lang - else - "#{lang}" - end - }.join(' | ') - end - c.define_tag 'link' do |tag| - item = Item.first(:conditions => { :full_name => tag.attr['name'] }) - ret = '' - ret << "" - ret << item.i18n_variable[I18n.locale] - ret << '' - end - c.define_tag 'menu' do |tag| - home = get_homepage - menu = page.design.layout.menu - menu_level(home, 0, menu) - end - end - end - - def parse_page(page, id = nil) - if page._type == 'Page' - context = parser_context(page, {}, id) - parser = Radius::Parser.new(context, :tag_prefix => 'r') - parser.parse(parser.parse(page.design.layout.body)) - end - end - - def self.included(base) - base.send :helper_method, :parse_page if base.respond_to? :helper_method - end - - + # c.define_tag 'language_bar' do + # @site.in_use_locales.map{ |locale| + # lang = I18nVariable.first(:conditions => {:key => locale})[locale] + # if I18n.locale.to_s.eql?(locale) + # lang + # else + # "#{lang}" + # end + # }.join(' | ') + # end + # c.define_tag 'link' do |tag| + # item = Item.first(:conditions => { :full_name => tag.attr['name'] }) + # ret = '' + # ret << "" + # ret << item.i18n_variable[I18n.locale] + # ret << '' + # end + # end require 'nokogiri' def parse_page_noko(page, id = nil) body = Nokogiri::HTML(page.design.layout.body) + parse_menu(body, page) + public_r_tags = parse_contents(body, page, id) + parse_images(body, page) - # page_contents + public_r_tags.each do |tag| + send("parse_#{tag}s", body, page,id) + end + + body.to_html + end + + # page_contents + def parse_contents(body, page, id) + public_r_tags = [] body.css('.page_content').each do |content| ret = '' if (content["main"] == "true" && !page.module_app.nil?) @@ -129,6 +58,7 @@ module ParserFrontEnd end when 'public_r_tag' ret << "" + public_r_tags << part.public_r_tag else '' end @@ -141,54 +71,7 @@ module ParserFrontEnd fragment = Nokogiri::HTML::DocumentFragment.new(body, scope) content.swap(fragment) end - - # page_menu - page_menu = body.css('.page_menu').first - home = get_homepage - menu = page.design.layout.menu - fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu)) - page_menu.swap(fragment) - - # page_image - body.css('.page_image').each do |page_image| - # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } - # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image - if image - res = "' - end - fragment = Nokogiri::HTML::DocumentFragment.new(body, res) - page_image.swap(fragment) - end - - # ad_banner - body.css('ad_banner').each do |banner| - res = '' - ad_banner = AdBanner.find(banner["id"]) rescue nil - if ad_banner && ad_banner.display? - res << "" - res << "
    " - ad_banner.ad_images.each do |ad_image| - res << "" - end - res << "
    " - end - fragment = Nokogiri::HTML::DocumentFragment.new(body, res) - banner.swap(fragment) - end - - body.to_html + public_r_tags.uniq end end From cf297fc4247c2c19ba0e5deb09151e958b636959 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 18:04:09 +0800 Subject: [PATCH 055/125] Changed inherited controller in module_apps to OrbitBackendController --- app/controllers/orbit_backend_controller.rb | 2 +- .../announcement/back_end/bulletin_categorys_controller.rb | 2 -- .../panel/announcement/back_end/bulletins_controller.rb | 1 - .../panel/announcement/back_end/fact_checks_controller.rb | 1 - .../panel/page_content/back_end/page_contexts_controller.rb | 5 +---- .../web_resource/back_end/web_link_categorys_controller.rb | 4 +--- .../panel/web_resource/back_end/web_links_controller.rb | 5 +---- 7 files changed, 4 insertions(+), 16 deletions(-) diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb index c71bbf15..fe37db82 100644 --- a/app/controllers/orbit_backend_controller.rb +++ b/app/controllers/orbit_backend_controller.rb @@ -6,7 +6,7 @@ class OrbitBackendController< ApplicationController include OrbitCoreLib::PermissionUnility include AdminHelper - layout 'admin' + layout 'new_admin' def setup_vars @app_title = request.fullpath.split('/')[2] diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb index 97378c5a..0e3894b9 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb @@ -1,7 +1,5 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController - layout 'new_admin' - def index @bulletin_categorys = BulletinCategory.all @bulletin_category = BulletinCategory.new(:display => 'List') diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 31b3b4a2..d02d5035 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -1,5 +1,4 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController - layout 'new_admin' before_filter :authenticate_user! before_filter :is_admin? diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb index 9095a4d3..606225e9 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb @@ -2,7 +2,6 @@ class Panel::Announcement::BackEnd::FactChecksController < OrbitBackendControll before_filter :authenticate_user! include AdminHelper # layout 'admin' - layout 'new_admin' def setting @bulletin_categorys = BulletinCategory.all 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 efde60c8..10a33236 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 @@ -1,7 +1,4 @@ -class Panel::PageContent::BackEnd::PageContextsController < ApplicationController - - - layout 'new_admin' +class Panel::PageContent::BackEnd::PageContextsController < OrbitBackendController before_filter :authenticate_user! before_filter :is_admin? diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb index f023995b..46e8933f 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb @@ -1,6 +1,4 @@ -class Panel::WebResource::BackEnd::WebLinkCategorysController < ApplicationController - - layout 'new_admin' +class Panel::WebResource::BackEnd::WebLinkCategorysController < OrbitBackendController def index @web_link_categorys = WebLinkCategory.all 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 064a6d46..e2b681b9 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 @@ -1,7 +1,4 @@ -class Panel::WebResource::BackEnd::WebLinksController < ApplicationController - - - layout 'new_admin' +class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController before_filter :authenticate_user! before_filter :is_admin? From 7eff06a3781e951760b91b202039b21fc78f2fa4 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 22 Mar 2012 01:51:16 +0800 Subject: [PATCH 056/125] Trying nokogiri --- lib/parsers/parser_front_end.rb | 68 +++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index c3ca1787..0f67d946 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -73,5 +73,73 @@ module ParserFrontEnd end public_r_tags.uniq end + + + + require 'nokogiri' + + def parse_page_noko(page, id = nil) + body = Nokogiri::HTML(page.design.layout.body, nil, 'UTF-8') + + # page_contents + body.css('.page_content').each do |content| + ret = '' + if (content["main"] == "true" && !page.module_app.nil?) + ret << "
    " + else + part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil + case part.kind + when 'text' + ret << part.i18n_variable[I18n.locale] rescue '' + when 'module_widget' + if part[:category] + ret << "
    " + else + ret << "
    " + end + when 'public_r_tag' + ret << "" + else + '' + end + end + scope = "<#{content.name}" + content.attributes.each_pair do |key, value| + scope << " #{key}='#{value}'" + end + scope << ">#{ret}" + fragment = Nokogiri::HTML::DocumentFragment.new(body, scope) + content.swap(fragment) + end + + # page_menu + page_menu = body.css('.page_menu').first + home = get_homepage + menu = page.design.layout.menu + fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu)) + page_menu.swap(fragment) + + # page_image + body.css('.page_image').each do |page_image| + # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } + # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image + image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image + if image + res = "' + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, res) + page_image.swap(fragment) + end + + body.to_html + end end From 0f60ab9fc2c2e0e27b4350004e71bc5054fa3b6c Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 22 Mar 2012 10:11:02 +0800 Subject: [PATCH 057/125] Add ad_banner to nokogiri --- lib/parsers/parser_front_end.rb | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 0f67d946..fa4cb70d 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -79,7 +79,7 @@ module ParserFrontEnd require 'nokogiri' def parse_page_noko(page, id = nil) - body = Nokogiri::HTML(page.design.layout.body, nil, 'UTF-8') + body = Nokogiri::HTML(page.design.layout.body) # page_contents body.css('.page_content').each do |content| @@ -139,6 +139,29 @@ module ParserFrontEnd page_image.swap(fragment) end + # ad_banner + body.css('ad_banner').each do |banner| + res = '' + ad_banner = AdBanner.find(banner["id"]) rescue nil + if ad_banner && ad_banner.display? + res << "" + res << "
    " + ad_banner.ad_images.each do |ad_image| + res << "" + end + res << "
    " + end + fragment = Nokogiri::HTML::DocumentFragment.new(body, res) + banner.swap(fragment) + end + body.to_html end From c5f6dbc1c41328c9986bdd25d8c2eef9385d9e3b Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 17:57:50 +0800 Subject: [PATCH 058/125] Nokogiri in parsers --- lib/parsers/parser_front_end.rb | 91 --------------------------------- 1 file changed, 91 deletions(-) diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index fa4cb70d..c3ca1787 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -73,96 +73,5 @@ module ParserFrontEnd end public_r_tags.uniq end - - - - require 'nokogiri' - - def parse_page_noko(page, id = nil) - body = Nokogiri::HTML(page.design.layout.body) - - # page_contents - body.css('.page_content').each do |content| - ret = '' - if (content["main"] == "true" && !page.module_app.nil?) - ret << "
    " - else - part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil - case part.kind - when 'text' - ret << part.i18n_variable[I18n.locale] rescue '' - when 'module_widget' - if part[:category] - ret << "
    " - else - ret << "
    " - end - when 'public_r_tag' - ret << "" - else - '' - end - end - scope = "<#{content.name}" - content.attributes.each_pair do |key, value| - scope << " #{key}='#{value}'" - end - scope << ">#{ret}" - fragment = Nokogiri::HTML::DocumentFragment.new(body, scope) - content.swap(fragment) - end - - # page_menu - page_menu = body.css('.page_menu').first - home = get_homepage - menu = page.design.layout.menu - fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu)) - page_menu.swap(fragment) - - # page_image - body.css('.page_image').each do |page_image| - # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } - # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image - if image - res = "' - end - fragment = Nokogiri::HTML::DocumentFragment.new(body, res) - page_image.swap(fragment) - end - - # ad_banner - body.css('ad_banner').each do |banner| - res = '' - ad_banner = AdBanner.find(banner["id"]) rescue nil - if ad_banner && ad_banner.display? - res << "" - res << "
    " - ad_banner.ad_images.each do |ad_image| - res << "" - end - res << "
    " - end - fragment = Nokogiri::HTML::DocumentFragment.new(body, res) - banner.swap(fragment) - end - - body.to_html - end end From 717e50a25e5173b3740946d8a597530d26f6b2b4 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 18:28:09 +0800 Subject: [PATCH 059/125] Add rake task for layout with nokogiri --- lib/noko/layout.html | 184 +++++++++++++++++++++++++++++++++++++++++++ lib/tasks/noko.rake | 13 +++ 2 files changed, 197 insertions(+) create mode 100755 lib/noko/layout.html create mode 100644 lib/tasks/noko.rake diff --git a/lib/noko/layout.html b/lib/noko/layout.html new file mode 100755 index 00000000..8723d6a7 --- /dev/null +++ b/lib/noko/layout.html @@ -0,0 +1,184 @@ + + + + + + RulingSite + + + + + + + + + + +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + + +
    + + diff --git a/lib/tasks/noko.rake b/lib/tasks/noko.rake new file mode 100644 index 00000000..b411fa30 --- /dev/null +++ b/lib/tasks/noko.rake @@ -0,0 +1,13 @@ +# encoding: utf-8 + +namespace :nokogiri do + task :layout => :environment do + l = Design.first(:conditions => {:title => 'CCU'}).layout + l.layout_parts.destroy rescue nil + l.menu.destroy rescue nil + l.design.save + l = Design.first(:conditions => {:title => 'CCU'}).layout + l.file = File.open("#{Rails.root}/lib/noko/layout.html") + l.design.save + end +end \ No newline at end of file From 1e60acaa11d0f1c0765cddcc5ef34f276dde6c74 Mon Sep 17 00:00:00 2001 From: Matt Fu Date: Thu, 22 Mar 2012 14:33:59 +0800 Subject: [PATCH 060/125] Fact check program completed,Lin checked --- .../panel/announcement/back_end/bulletins/_bulletin.html.erb | 1 + .../views/panel/announcement/back_end/bulletins/_form.html.erb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index 62b28c0c..a15c413b 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -37,6 +37,7 @@
  • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    • + <%= bulletin.postdate %> <%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %> 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 f3d6ab6a..3a4e94cd 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 @@ -14,7 +14,6 @@ <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %> <%= f.text_field :not_checked_reason %>
    - <%= f.error_messages %> From 50be40f7b3ed6a1a017831c5cd7983111e23ec91 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 15:03:00 +0800 Subject: [PATCH 061/125] Ray's changes in announcenment back-end --- .../panel/announcement/back_end/bulletins/_bulletin.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index a15c413b..62b28c0c 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -37,7 +37,6 @@
  • <%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
    • - <%= bulletin.postdate %> <%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %> From b587b7ca6b37fea0f9c48365991d7dc4b9471dbd Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 19:22:50 +0800 Subject: [PATCH 062/125] Remove limit(1) to bulletins index action --- .../panel/announcement/back_end/bulletins_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index d02d5035..648c8d55 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -13,7 +13,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletins = Bulletin.search(params[:search], params[:category_id]) # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]]) - @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.limit(1).desc("postdate") + @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all.desc("postdate") @bulletin_categories = BulletinCategory.all @bulletin_link = BulletinLink.new From 212730fd8ab02534929643485091502492a752ff Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 19:37:47 +0800 Subject: [PATCH 063/125] Add missing end tag in bulletin _form --- .../views/panel/announcement/back_end/bulletins/_form.html.erb | 1 + 1 file changed, 1 insertion(+) 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 3a4e94cd..0ba87a70 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 @@ -14,6 +14,7 @@ <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %> <%= f.text_field :not_checked_reason %>
    + <% end %> <%= f.error_messages %> From 172d3d7847545e3d3326946e8e6bceca9038b072 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Tue, 27 Mar 2012 19:42:07 +0800 Subject: [PATCH 064/125] Remove bad references to NewBlog --- .../panel/announcement/front_end/bulletins_controller.rb | 2 +- .../panel/announcement/widget/bulletins_controller.rb | 2 +- .../panel/page_content/front_end/page_contexts_controller.rb | 2 +- .../panel/web_resource/front_end/web_links_controller.rb | 2 +- .../panel/web_resource/widget/web_links_controller.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb index fe0b2aa5..3ba0e666 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb @@ -2,7 +2,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController def initialize super - @app_title = NewBlog::MOUDLEAPP_TITLE + @app_title = 'announcement' end # GET /bulletins diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index 783ee9ef..96277c5e 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -2,7 +2,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController def initialize super - @app_title = NewBlog::MOUDLEAPP_TITLE + @app_title = 'announcement' end # GET /bulletins diff --git a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb index 5b46866b..b8842169 100644 --- a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb +++ b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb @@ -2,7 +2,7 @@ class Panel::PageContent::FrontEnd::PageContextsController < OrbitWidgetControll def initialize super - @app_title = NewBlog::MOUDLEAPP_TITLE + @app_title = 'page_content' end def index diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb index 54374ed3..82804979 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb @@ -2,7 +2,7 @@ class Panel::WebResource::FrontEnd::WebLinksController < OrbitWidgetController def initialize super - @app_title = NewBlog::MOUDLEAPP_TITLE + @app_title = 'web_resource' end # GET /web_links diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb index 750897ae..8ab0eeb9 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb @@ -2,7 +2,7 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController def initialize super - @app_title = NewBlog::MOUDLEAPP_TITLE + @app_title = 'web_resource' end # GET /web_links From c645c1b5df37a64ceab35b6d9c70dc99470d3e9a Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 28 Mar 2012 10:51:14 +0800 Subject: [PATCH 065/125] Remove extra code in bulletin form --- .../back_end/bulletins/_form.html.erb | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) 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 0ba87a70..2ecadbf8 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 @@ -1,25 +1,10 @@ <% # encoding: utf-8 %> - <%= f.error_messages %> - <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %> - - <% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin?%> -
    - <%= label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %> - <%= f.radio_button :is_checked, true%> - <%= label :is_checked_true, t('announcement.bulletin.fact_check_pass') %> - <%= f.radio_button :is_checked, false, (@bulletin.is_checked.nil?? {:checked => true} : {}) %> - <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass') %> - - <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %> - <%= f.text_field :not_checked_reason %> -
    - <% end %> <%= f.error_messages %>
    - <% if params[:action] != 'new' %> + <% if params[:action] != 'new' %>
    From 649f343e6f574c6a002220060d7672f0e5386a54 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 28 Mar 2012 11:17:59 +0800 Subject: [PATCH 066/125] Ray's fix for margin-top --- app/assets/javascripts/orbit-1.0.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index cbb6e0b8..d91e3533 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -99,7 +99,11 @@ function mainTablePosition() { var $height = $('#main-wrap > .subnav').height() var $table = $('#main-wrap > .table') //alert ($table.height()) - $table.stop().animate({marginTop:$height-17},500) + $height = $height-17; + if($height<0){ + $height = 0; + } + $table.stop().animate({marginTop:$height},500) //$table.css({marginTop : $height}) } $(window).scroll(function () { From d6e4da6dad3f82e708cee7baf8793361c239c643 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 28 Mar 2012 11:17:59 +0800 Subject: [PATCH 067/125] Ray's fix for margin-top --- app/assets/javascripts/orbit-1.0.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index cbb6e0b8..d91e3533 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -99,7 +99,11 @@ function mainTablePosition() { var $height = $('#main-wrap > .subnav').height() var $table = $('#main-wrap > .table') //alert ($table.height()) - $table.stop().animate({marginTop:$height-17},500) + $height = $height-17; + if($height<0){ + $height = 0; + } + $table.stop().animate({marginTop:$height},500) //$table.css({marginTop : $height}) } $(window).scroll(function () { From e7fdcfffa0b8e04690eb2a185979980b1d1527ec Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 28 Mar 2012 12:12:23 +0800 Subject: [PATCH 068/125] Fix sidebar --- app/views/layouts/_side_bar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index baeef6c4..e2f757db 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -9,7 +9,7 @@ <%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %> <%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %> <%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %> - <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') if is_manager? %> + <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') if (is_manager? rescue nil) %> <% end -%> <% end -%> From 25c24c03f9bf4d8a88a8c79935d5029cbe6b4a81 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Wed, 28 Mar 2012 19:40:12 +0800 Subject: [PATCH 069/125] Add pagination to bulletin index and remove ajax to make it simple --- app/assets/javascripts/orbit-1.0.js | 5 --- .../back_end/bulletins_controller.rb | 26 +++++++------ .../back_end/bulletins/_bulletins.html.erb | 36 ------------------ .../back_end/bulletins/_filter.html.erb | 37 ++++++++----------- .../back_end/bulletins/index.html.erb | 2 + .../back_end/bulletins/index.js.erb | 1 - 6 files changed, 32 insertions(+), 75 deletions(-) delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index d91e3533..ffd16e82 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -39,11 +39,6 @@ $(document).ready(function(){ break; } }); - - $(document).on('click', '.sort-header > .sort', function() { - $.getScript($(this).attr('rel')); - }); - var $role = $('.select-role'); var method =$('.privacy:eq(1)').attr('checked'); diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 648c8d55..3642fe4f 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -8,19 +8,19 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletins = Bulletin.desc("postdate desc") get_categorys(params[:bulletin_category_id]) get_tags - + # @bulletins = Bulletin.where("bulletin_category_id" => params[:bulletin_category_id]).desc("postdate") if params[:bulletin_category_id] # @bulletins = Bulletin.search(params[:search], params[:category_id]) # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]]) - @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all.desc("postdate") + @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all.desc("postdate").page(params[:page]).per(10) @bulletin_categories = BulletinCategory.all - + @bulletin_link = BulletinLink.new - @link_url = panel_announcement_back_end_bulletins_path + @link_url = panel_announcement_back_end_bulletins_path @bulletin_file = BulletinFile.new - @file_url = panel_announcement_back_end_bulletins_path + @file_url = panel_announcement_back_end_bulletins_path respond_to do |format| format.html # index.html.erb @@ -299,7 +299,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController bulletins = Bulletin.all case params[:sort] when 'postdate', 'deadline' - bulletins.order_by([params[:sort], params[:direction]]) + bulletins.order_by([params[:sort], params[:direction]]).page(params[:page]).per(10) when 'category' category_ids = bulletins.distinct(:bulletin_category_id) categories = BulletinCategory.find(category_ids) rescue nil @@ -308,7 +308,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController categories.each { |category| h[category.i18n_variable[I18n.locale]] = category.id } sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse! sorted_categorys = sorted.collect {|a| bulletins.where(:bulletin_category_id => a[1]).entries } - sorted_categorys.flatten + sorted_categorys.flatten! + Kaminari.paginate_array(sorted_categorys).page(params[:page]).per(10) else nil end @@ -316,9 +317,10 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController h = Hash.new bulletins.each { |bulletin| h[bulletin.title[I18n.locale]] = bulletin } sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse! - sorted.collect {|a| a[1] } + sorted_titles = sorted.collect {|a| a[1] } + Kaminari.paginate_array(sorted_titles).page(params[:page]).per(10) when 'status' - bulletins.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction]) + bulletins.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction]).page(params[:page]).per(10) when 'update_user_id' user_ids = bulletins.distinct(:update_user_id) users = User.find(user_ids) rescue nil @@ -327,7 +329,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController users.each { |user| h[user.name] = user.id } sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse! sorted_users = sorted.collect {|a| bulletins.where(:update_user_id => a[1]).entries } - sorted_users.flatten + sorted_users.flatten! + Kaminari.paginate_array(sorted_users).page(params[:page]).per(10) else nil end @@ -335,7 +338,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController a = Array.new AnnouncementTag.all.order_by(I18n.locale, params[:direction]).each { |tag| a << tag.bulletins } a.flatten! - a.uniq + a.uniq! + Kaminari.paginate_array(a).page(params[:page]).per(10) end end diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb index 979f3f4a..81daae8b 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb @@ -1,39 +1,3 @@ - diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb index 09222a36..f8ea5418 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb @@ -1,4 +1,4 @@ -
    +" else part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil - ret << "
    " + ret << "
    " if part ret << "' case part.kind when 'text' @@ -65,7 +65,7 @@ module ParserBackEnd public_r_tags << part.public_r_tag else '' - end + end if part end scope = "<#{content.name}" content.attributes.each_pair do |key, value| diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index c3ca1787..dfec0dd9 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -61,7 +61,7 @@ module ParserFrontEnd public_r_tags << part.public_r_tag else '' - end + end if part end scope = "<#{content.name}" content.attributes.each_pair do |key, value| From ecc789c248967635383f525911c8afae0e2713b3 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 2 Apr 2012 02:45:23 +0800 Subject: [PATCH 073/125] Add missing load ofr meta folder --- config/application.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/application.rb b/config/application.rb index 381d1c64..cef8c446 100644 --- a/config/application.rb +++ b/config/application.rb @@ -31,6 +31,7 @@ module Orbit config.autoload_paths += %W(#{config.root}/lib) config.autoload_paths += %W(#{config.root}/lib/parsers) config.autoload_paths += %W(#{config.root}/app/models/design) + config.autoload_paths += %W(#{config.root}/app/models/meta) config.autoload_paths += %W(#{config.root}/app/models/purchase) config.autoload_paths += %W(#{config.root}/app/models/user) From f7dafbc0cdfb87ee3a7f5cd9334b3f6b891fb222 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 2 Apr 2012 02:46:34 +0800 Subject: [PATCH 074/125] Ray's changes in tags, css and js --- .../javascripts/inc/permission-checkbox.js | 12 +++++ app/assets/javascripts/orbit-1.0.js | 38 ++++++------- app/assets/javascripts/orbit-bar-member.js | 15 ++++++ .../stylesheets/inc/permission-checkbox.css | 53 +++++++++++++++++++ app/assets/stylesheets/list.css | 28 +++++----- app/assets/stylesheets/style.css.erb | 27 +++++++++- app/helpers/application_helper.rb | 2 +- app/views/admin/tags/_tag.html.erb | 9 +++- app/views/admin/tags/index.html.erb | 18 +++++-- app/views/admin/tags/update.js.erb | 2 +- .../back_end/fact_checks/setting.html.erb | 21 +++++--- 11 files changed, 172 insertions(+), 53 deletions(-) create mode 100644 app/assets/javascripts/inc/permission-checkbox.js create mode 100644 app/assets/javascripts/orbit-bar-member.js create mode 100644 app/assets/stylesheets/inc/permission-checkbox.css diff --git a/app/assets/javascripts/inc/permission-checkbox.js b/app/assets/javascripts/inc/permission-checkbox.js new file mode 100644 index 00000000..f106e795 --- /dev/null +++ b/app/assets/javascripts/inc/permission-checkbox.js @@ -0,0 +1,12 @@ +$('.check[checked="checked"]').parents(".checkbox").addClass("checked") +$(".checkbox").click(function(){ + if($(this).children(".check").attr("checked")){ + // uncheck + $(this).children(".check").attr('checked', false); + $(this).removeClass("checked"); + }else{ + // check + $(this).children(".check").attr({checked: "checked"}); + $(this).addClass("checked"); + } +}); \ No newline at end of file diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index ffd16e82..a894beea 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -9,27 +9,14 @@ function resize() { } } $(document).ready(function(){ - $(document).on('click', '.orbit-bar-member', function(){ - $(this).hasClass('open') ? $(this).removeClass('open') : $(this).addClass('open'); - $('.bar-login .dropdown-menu').toggle(); - return false; - }); - - $(document).click(function() { - $('.orbit-bar-member').removeClass("open"); - $('.bar-login .dropdown-menu').hide(); - }); - - $(document).on('click', '.bar-login .dropdown-menu', function(e) { - e.stopPropagation(); - $('.bar-login .dropdown-menu').show(); - }); $('.tip').tooltip({ placement: "left" }); $(document).on('click', '.privacy', function() { + + console.log($(this).val()); switch ($(this).val()) { case 'true': $(this).parents('.controls').children('.select-role').slideUp(300); @@ -68,7 +55,7 @@ $(document).ready(function(){ $('#main-sidebar').tinyscrollbar(); $('.detal-list').tinyscrollbar(); $('#main-sidebar').tinyscrollbar({size:(viewportheight-34)}); - mainTablePosition() + mainTablePosition(); /*isotope*/ var $container = $('#isotope'); @@ -87,18 +74,23 @@ $(window).resize(function(){ $('.post-title').css("width", viewportwidth-495); $('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft) $('#main-sidebar').tinyscrollbar({size:(viewportheight-34)}); - mainTablePosition() + mainTablePosition(); }); /*main-table position*/ function mainTablePosition() { - var $height = $('#main-wrap > .subnav').height() - var $table = $('#main-wrap > .table') + var $height = $('#main-wrap .subnav').length && $('#main-wrap .subnav').height(); + var $table = $('#main-wrap > .table').length && $('#main-wrap > .table'); + var $nottable = $('#main-wrap .nottable').length && $('#main-wrap .nottable'); //alert ($table.height()) - $height = $height-17; - if($height<0){ - $height = 0; + if($nottable==0){ + if($height>0){ + $height = $height-17; + } + $table.stop().animate({marginTop:$height},500); } - $table.stop().animate({marginTop:$height},500) + if($table==0){ + $nottable.css({marginTop:$height}); + }; //$table.css({marginTop : $height}) } $(window).scroll(function () { diff --git a/app/assets/javascripts/orbit-bar-member.js b/app/assets/javascripts/orbit-bar-member.js new file mode 100644 index 00000000..5e65d4a3 --- /dev/null +++ b/app/assets/javascripts/orbit-bar-member.js @@ -0,0 +1,15 @@ +$(document).on('click', '.orbit-bar-member', function(){ + $(this).hasClass('open') ? $(this).removeClass('open') : $(this).addClass('open'); + $('.bar-login .dropdown-menu').toggle(); + return false; +}); + +$(document).click(function() { + $('.orbit-bar-member').removeClass("open"); + $('.bar-login .dropdown-menu').hide(); +}); + +$(document).on('click', '.bar-login .dropdown-menu', function(e) { + e.stopPropagation(); + $('.bar-login .dropdown-menu').show(); +}); \ No newline at end of file diff --git a/app/assets/stylesheets/inc/permission-checkbox.css b/app/assets/stylesheets/inc/permission-checkbox.css new file mode 100644 index 00000000..9d7beb5e --- /dev/null +++ b/app/assets/stylesheets/inc/permission-checkbox.css @@ -0,0 +1,53 @@ +.checkblock { + display: inline-block; + float: left; + width: 200px; +} +.check[type="checkbox"]{ + display:none; +} +.checkbox{ + padding:5px; + margin:5px; + display: inline-block; + color:#777777; + text-shadow: 0 1px 0px rgba(255,255,255,.4); + border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + height: 30px; + position: relative; + cursor: pointer; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) ); + background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf'); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); +} +.checkbox .check-icon { + display: none; + position: absolute; + width: 22px; + height: 22px; + border-radius: 11px; + background-color: #d0f311; + right: -5px; + top: -5px; + box-shadow: 0px 0px 5px rgba(0,0,0,.05); +} +.checkbox .check-icon i { + margin: 1px 0 0 3px; +} +.checkbox .member-name { + line-height: 30px; + padding: 0 10px; +} +img.member-img { + display: inline-block; + float: left; + max-width: 30px; +} +.checked .check-icon { + display: block; +} \ No newline at end of file diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css index b4becb42..11f17a55 100644 --- a/app/assets/stylesheets/list.css +++ b/app/assets/stylesheets/list.css @@ -39,8 +39,8 @@ left: -8px; } .main-list td { - background-color: #FFFFFF; - border-bottom: 1px solid #DDDDDD; + background-color: #FFFFFF; + border-bottom: 1px solid #DDDDDD; border-top: medium none; } .main-list .nav { @@ -77,15 +77,15 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; z-index: 5; -} -.table-label { - background-color: #F2F2F2; - position: relative; -} -.table-label .main-list thead th { - background-color: #F2F2F2; - border-right: 1px solid #DDDDDD; - border-top: 1px solid #DDDDDD !important; +} +.table-label { + background-color: #F2F2F2; + position: relative; +} +.table-label .main-list thead th { + background-color: #F2F2F2; + border-right: 1px solid #DDDDDD; + border-top: 1px solid #DDDDDD !important; } .route-group .route { padding: 0; @@ -120,9 +120,9 @@ legend { -webkit-border-radius: 0; border-radius: 0; border-left: none; - border-right: none; - position: fixed; - top: 30px; + border-right: none; + position: fixed; + top: 30px; z-index: 50; } .subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover { diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index 2e203a02..a261bfe7 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -266,7 +266,6 @@ padding-top: 32px; padding-bottom: 18px; position: relative; - min-height: 100%; } #main-wrap > .form-actions { background-color: #FFF; @@ -383,6 +382,9 @@ border-top-color: #0088CC; margin-top: 6px; } +.filter form { + margin: 5px 10px; +} .filter .active { background-color: #0088CC; } @@ -417,6 +419,26 @@ .filters .in { /*border-bottom: 1px solid rgba(0,0,0,0.07)*/ } +#tags { +} +#tags .tag { + line-height: 32px; + padding: 0 10px; + background-color: #FFFFFF; + border-bottom: 1px solid #DDDDDD; + border-top: medium none; +} +#tags .tag form, #tags .tag form input { + margin:0; +} +#tags .tagitem { + display: inline-block; + float: left; +} +#tags .action { + display: inline-block; + float: right; +} .sign-in { width: 360px; margin: 0 auto 70px; @@ -775,6 +797,9 @@ background-position: -224px -320px; } /*12*/ +.icons-check-2 { + background-position: -288px -352px; +} .icons-star-thin { background-position: -416px -352px; } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9c03de3d..558129c7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -145,7 +145,7 @@ module ApplicationHelper javascripts << "\n" javascripts << "\n" javascripts << "\n" - javascripts << "\n" + javascripts << "\n" javascripts << "\n" javascripts << "\n" page.design.javascripts.each do |js| diff --git a/app/views/admin/tags/_tag.html.erb b/app/views/admin/tags/_tag.html.erb index a103efc4..1f9ff38a 100644 --- a/app/views/admin/tags/_tag.html.erb +++ b/app/views/admin/tags/_tag.html.erb @@ -1,8 +1,13 @@ -
    +
    +
    + <% @site_valid_locales.each do |locale| %> - <%= I18nVariable.from_locale(locale) %>: + <%#= I18nVariable.from_locale(locale) %> <%= tag[locale] %> <% end %> +
    +
    <%= link_to t(:edit), edit_admin_tag_path(tag), :remote => true %> <%= link_to t(:delete), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true %> +
    \ No newline at end of file diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index 5e757313..a8a1aa34 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -1,6 +1,16 @@ -
    +
    +
      +
    • +
      + + +
      +
      • +
    +
    +
    <%= render :partial => 'tag', :collection => @tags %>
    -------------------------- -
    -<%= render 'add' %> \ No newline at end of file +
    + <%= render 'add' %> +
    \ No newline at end of file diff --git a/app/views/admin/tags/update.js.erb b/app/views/admin/tags/update.js.erb index 1df91e08..9cd63e4c 100644 --- a/app/views/admin/tags/update.js.erb +++ b/app/views/admin/tags/update.js.erb @@ -1 +1 @@ -$('#<%= dom_id @tag %>').html("<%= j render :partial => 'tag', :object => @tag %>") \ No newline at end of file +$('#<%= dom_id @tag %>').replaceWith("<%= j render :partial => 'tag', :object => @tag %>") \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb index d5d589cf..16e76f09 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb @@ -1,17 +1,24 @@ -<%= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %> -
    +<%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %> <%= form_tag('', :remote => true) %> -<%= label_tag :category, t("announcement.bulletin.category") %> -<%= select_tag "category_id", options_from_collection_for_select(@bulletin_categorys, "id", "key") %> - -
    -<%= label_tag :role, t("admin.roles") %> +
    +
      +
    • +
      + <%= label_tag :category, t("announcement.bulletin.category") %> + <%= select_tag "category_id", options_from_collection_for_select(@bulletin_categorys, "id", "key") %> +
      +
      • +
    +
    +<%#= label_tag :role, t("admin.roles") %> +
    <%= content_tag :div do -%> <% form_tag :action => "update_setting" do %> <%= render :partial => "privilege_user", :locals => {:users => @users_array} %> <%= submit_tag "Update" %> <% end -%> <% end -%> +
    \n" javascripts << "\n" javascripts << "\n" - javascripts << "\n" + javascripts << "\n" javascripts << "\n" javascripts << "\n" page.design.javascripts.each do |js| diff --git a/app/views/admin/tags/_tag.html.erb b/app/views/admin/tags/_tag.html.erb index a103efc4..1f9ff38a 100644 --- a/app/views/admin/tags/_tag.html.erb +++ b/app/views/admin/tags/_tag.html.erb @@ -1,8 +1,13 @@ -
    +
    +
    + <% @site_valid_locales.each do |locale| %> - <%= I18nVariable.from_locale(locale) %>: + <%#= I18nVariable.from_locale(locale) %> <%= tag[locale] %> <% end %> +
    +
    <%= link_to t(:edit), edit_admin_tag_path(tag), :remote => true %> <%= link_to t(:delete), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true %> +
    \ No newline at end of file diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index 5e757313..a8a1aa34 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -1,6 +1,16 @@ -
    +
    +
      +
    • +
      + + +
      +
      • +
    +
    +
    <%= render :partial => 'tag', :collection => @tags %>
    -------------------------- -
    -<%= render 'add' %> \ No newline at end of file +
    + <%= render 'add' %> +
    \ No newline at end of file diff --git a/app/views/admin/tags/update.js.erb b/app/views/admin/tags/update.js.erb index 1df91e08..9cd63e4c 100644 --- a/app/views/admin/tags/update.js.erb +++ b/app/views/admin/tags/update.js.erb @@ -1 +1 @@ -$('#<%= dom_id @tag %>').html("<%= j render :partial => 'tag', :object => @tag %>") \ No newline at end of file +$('#<%= dom_id @tag %>').replaceWith("<%= j render :partial => 'tag', :object => @tag %>") \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb index d5d589cf..16e76f09 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb @@ -1,17 +1,24 @@ -<%= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %> -
    +<%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %> <%= form_tag('', :remote => true) %> -<%= label_tag :category, t("announcement.bulletin.category") %> -<%= select_tag "category_id", options_from_collection_for_select(@bulletin_categorys, "id", "key") %> - -
    -<%= label_tag :role, t("admin.roles") %> +
    +
      +
    • +
      + <%= label_tag :category, t("announcement.bulletin.category") %> + <%= select_tag "category_id", options_from_collection_for_select(@bulletin_categorys, "id", "key") %> +
      +
      • +
    +
    +<%#= label_tag :role, t("admin.roles") %> +
    <%= content_tag :div do -%> <% form_tag :action => "update_setting" do %> <%= render :partial => "privilege_user", :locals => {:users => @users_array} %> <%= submit_tag "Update" %> <% end -%> <% end -%> +
    " + res << "
    " + printable_ad_images = [] + ad_banner.ad_images.each do |ad_image| + if ad_image.display? + ad_image.weight.times do + printable_ad_images << ad_image + end + end + end + + printable_ad_images.shuffle! + printable_ad_images.each do |ad_image| #TODO Need Reflact + res << "" + end + res << "
    " + res.html_safe + end + end + end \ No newline at end of file diff --git a/app/helpers/admin/ad_images_helper.rb b/app/helpers/admin/ad_images_helper.rb new file mode 100644 index 00000000..1f2422fc --- /dev/null +++ b/app/helpers/admin/ad_images_helper.rb @@ -0,0 +1,7 @@ +module Admin::AdImagesHelper + + def active_when_default_locale_eq locale + locale.to_sym == I18n.default_locale ? 'active': '' + end + +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 558129c7..f1a57fbd 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2,6 +2,12 @@ module ApplicationHelper FLASH_NOTICE_KEYS = [:error, :notice, :warning] + def site_valid_locales_default_head + index = @site_valid_locales.rindex I18n.default_locale.to_s + shift_out = @site_valid_locales.shift(index) + @site_valid_locales += shift_out + end + def colorize_in_use_locale(locale) @site_in_use_locales.include?(locale)? 'green' : 'red' end diff --git a/app/models/ad_banner.rb b/app/models/ad_banner.rb index 0a2928b3..3e09280f 100644 --- a/app/models/ad_banner.rb +++ b/app/models/ad_banner.rb @@ -4,41 +4,32 @@ class AdBanner include Mongoid::MultiParameterAttributes field :title - field :picture_position - field :post_date,type: Date - field :unpost_date,type: Date - field :context - field :direct_to_after_click,type: Boolean + field :transition_sec,type: Integer field :ad_fx #TODO Design should explain - - + before_save :save_or_destroy - - embeds_many :ad_images, :cascade_callbacks => true + validates_uniqueness_of :title + has_many :ad_images , dependent: :delete FX_TYPES = ["blindX","blindY","blindZ","cover","curtainX","curtainY","fade","fadeZoom","growX","growY","scrollUp","scrollDown","scrollLeft","scrollRight","scrollHorz","scrollVert","shuffle","slideX","slideY","toss","turnUp","turnDown","turnLeft","turnRight","uncover","wipe","zoom"] - def display? - if (self.post_date <= Date.today && (self.unpost_date.nil? || self.unpost_date>= Date.today)) - return true - end - return false - end + + # def new_ad_images(*attrs) + # debugger + # a=1 + # attrs[0].each do |attr| #Loop by JSs,Themes,Imgs + # unless attr[:file].nil? + # self.ad_images << AdImage.new(attr) + # end + # end + # end - def new_ad_images=(*attrs) - attrs[0].each do |attr| #Loop by JSs,Themes,Imgs - unless attr[:file].nil? - self.ad_images << AdImage.new(attr) - end - end - end - - def existing_ad_images=(*attrs) - attrs[0].each do |attr| #Loop by JSs,Themes,Imgs - ad_image = self.ad_images.find attr[0] - ad_image.update_attributes(attr[1]) - end - end + # def existing_ad_images=(*attrs) + # attrs[0].each do |attr| #Loop by JSs,Themes,Imgs + # ad_image = self.ad_images.find attr[0] + # ad_image.update_attributes(attr[1]) + # end + # end def save_or_destroy self.ad_images.each do |ad_image| diff --git a/app/models/ad_image.rb b/app/models/ad_image.rb index 5d06d798..3eb63511 100644 --- a/app/models/ad_image.rb +++ b/app/models/ad_image.rb @@ -3,19 +3,46 @@ class AdImage include Mongoid::Timestamps mount_uploader :file, ImageUploader + + has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + has_one :context, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - field :time_to_next #Weight - field :picture_intro - field :out_link - field :link_open + field :direct_to_after_click,type: Boolean + + field :weight ,type: Integer ,default: 1 + field :out_link #the link itself + field :link_open #how will the link be opened + LINK_OPEN_TYPES = ["new_window","local"] + + field :post_date,type: Date + field :unpost_date,type: Date field :to_save, :type => Boolean field :to_destroy, :type => Boolean - - LINK_OPEN_TYPES = ["new_window","local"] + + belongs_to :ad_banner + + # validates_numericality_of :weight, greater_than_or_equal_to: 1,less_than_or_equal_to: 10 + # validates_format_of :out_link, with: /(http:\/\/.*|)/ ,:message => 'Need a valid URL' + # validates_presence_of :post_date,:message => 'Need a valid post date' + attr_reader :parse_post_date,:parse_unpost_date + + def parse_post_date=(att) + self.post_date = (Date.parse att rescue nil) + end - embedded_in :ad_banner + def parse_unpost_date=(att) + self.unpost_date = (Date.parse att rescue nil) + end + + def display? + if (self.post_date <= Date.today && (self.unpost_date.nil? || self.unpost_date>= Date.today) rescue false) + return true + end + return false + end + def get_delay_time time = '' diff --git a/app/views/admin/ad_banners/_ad_banner.html.erb b/app/views/admin/ad_banners/_ad_banner.html.erb deleted file mode 100644 index 787a03ed..00000000 --- a/app/views/admin/ad_banners/_ad_banner.html.erb +++ /dev/null @@ -1,11 +0,0 @@ - - - <%= location %> - - > - - <%= link_to (ad_image.picture_intro || t("untitled")),'' %> - <%= start_date %> - <%= end_date.nil?? t('form.date_unlimited'): end_date %> - <%= style %> - \ No newline at end of file diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb new file mode 100644 index 00000000..78645ba7 --- /dev/null +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -0,0 +1,18 @@ + +
    " id=<%= ad_banner_tab.title %>> +

    撠箏站嚗

    + + <%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%> + <%= f.label :ad_fx, t('admin.ad_fx') %> + <%= f.select :ad_fx ,AdBanner::FX_TYPES %> + <%= f.submit %> + <%= f.submit 'Cancel',:type=>'reset' %> + <%= f.text_field :transition_sec,:placeholder=>"3蝘隢頛詨3000",:class=> "span3" %> +
    + <%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab} %> + <%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %> + <%= link_to 'Add AdImage',new_admin_ad_banner_ad_image_path(ad_banner_tab) %> +
    + <% end -%> + <%= preview_block ad_banner_tab %> +
    diff --git a/app/views/admin/ad_banners/_ad_image.html.erb b/app/views/admin/ad_banners/_ad_image.html.erb deleted file mode 100644 index e724a47f..00000000 --- a/app/views/admin/ad_banners/_ad_image.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -
    - <%= image_tag ad_image.file %> -

    - Time to next: <%= ad_image.time_to_next %> - Intro: <%= ad_image.picture_intro %> - Out Link <%= link_to ad_image.out_link %> by <%= ad_image.link_open %> -

    -
    diff --git a/app/views/admin/ad_banners/_ad_image_form.html.erb b/app/views/admin/ad_banners/_ad_image_form.html.erb deleted file mode 100644 index 3a153d47..00000000 --- a/app/views/admin/ad_banners/_ad_image_form.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -Time: <%= f.text_field :time_to_next ,:class=> 'ad_time'%> -Link:<%= f.text_field :out_link ,:class=> 'ad_out_link'%> -Open Type <%= f.select :link_open ,AdImage::LINK_OPEN_TYPES %> - -<%= f.hidden_field :to_save %> \ No newline at end of file diff --git a/app/views/admin/ad_banners/_ad_image_show.html.erb b/app/views/admin/ad_banners/_ad_image_show.html.erb deleted file mode 100644 index e724a47f..00000000 --- a/app/views/admin/ad_banners/_ad_image_show.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -
    - <%= image_tag ad_image.file %> -

    - Time to next: <%= ad_image.time_to_next %> - Intro: <%= ad_image.picture_intro %> - Out Link <%= link_to ad_image.out_link %> by <%= ad_image.link_open %> -

    -
    diff --git a/app/views/admin/ad_banners/_ad_image_update.html.erb b/app/views/admin/ad_banners/_ad_image_update.html.erb index e3d53b15..366d370d 100644 --- a/app/views/admin/ad_banners/_ad_image_update.html.erb +++ b/app/views/admin/ad_banners/_ad_image_update.html.erb @@ -1,9 +1,12 @@ -<%= fields_for "ad_banner[existing_ad_images][#{ad_image.id}]", ad_image do |f| %> - <%= image_tag ad_image.file %> -
    - Destroy?<%= f.check_box :to_destroy %> - <%= render :partial => "ad_image_form", :locals => { :f => f } %> -
    -<% end %> - +
  • + <%= image_tag ad_image.file %> +

    + <%= ad_image.display? ? '[Showing]' : '[NotShawing]' %> + <%= "#{ad_image.post_date ||'NeedReset' }~#{ad_image.unpost_date || 'NeedReset'}" %> +

    +

    + <%= link_to 'Edit',edit_admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn btn-primary' %> + <%= link_to 'Del',admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn',:method => :delete,:confirm => t('sure?') %> +

    +
    • diff --git a/app/views/admin/ad_banners/_form.html.erb b/app/views/admin/ad_banners/_form.html.erb deleted file mode 100644 index c29d9aef..00000000 --- a/app/views/admin/ad_banners/_form.html.erb +++ /dev/null @@ -1,53 +0,0 @@ -<% content_for :page_specific_css do %> - <%#= javascript_include_tag "ad_banner" #this line wont work %> - -<% end %> - - -

    - <%= f.label :title, t('admin.title') %> - <%= f.text_field :title, :class => 'text' %> -

    -

    - <%= f.label :picture_position, t('admin.picture_position') %> - <%= f.text_field :picture_position, :class => 'text' %> -

    - -

    - <%= f.label :post_date, t('admin.post_date') %> - <%= f.date_select :post_date, :order => [:year, :month, :day], :use_month_numbers => true %> -

    - -

    - <%= f.label :unpost_date, t('admin.unpost_date') %> - <%= f.date_select :unpost_date, :order => [:year, :month, :day], :use_month_numbers => true,:prompt => { :day => t('form.date_unlimited'), :month => t('form.date_unlimited'), :year => t('form.date_unlimited') } %> -

    -

    - <%= f.label :context, t('admin.context') %> - <%= f.text_field :context, :class => 'text' %> - -

    -

    - <%= f.label :direct_to_after_click, t('admin.direct_to_after_click') %> - <%= f.check_box :direct_to_after_click %> -

    -

    - <%= f.label :ad_fx, t('admin.ad_fx') %> - <%= f.select :ad_fx ,AdBanner::FX_TYPES %> -

    -

    - <%#= f.label :ad_images, t('admin.ad_images') %> - - <%# @ad_banner.ad_images.each do |ad_image| %> - <%#= render :partial => 'ad_image_update', :object => ad_image, :locals => { :field_name => "ad_images", :f => f, :classes => "r_destroy, r_edit" } %> - <%# end %> - <%= render :partial => "ad_image_update", :collection => @ad_banner.ad_images,:as => :ad_image, %> -

      - <%= render :partial => 'new_add_banner_file', :object => @ad_banner.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %> -

      - -

      - - - <%#= render :partial => 'new_design_file', :object => @design.themes.build, :locals => { :field_name => "themes", :f => f, :classes => "r_destroy" } %> -

      diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb new file mode 100644 index 00000000..976d11a9 --- /dev/null +++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb @@ -0,0 +1,40 @@ + + + \ No newline at end of file diff --git a/app/views/admin/ad_images/edit.html.erb b/app/views/admin/ad_images/edit.html.erb new file mode 100644 index 00000000..5fbf198c --- /dev/null +++ b/app/views/admin/ad_images/edit.html.erb @@ -0,0 +1,8 @@ +<%= flash_messages %> + +<%= form_for @ad_image, :url => admin_ad_banner_ad_image_path, :html => { :class => 'form' } do |f| %> + + <%= render :partial => "form", :locals => { :f => f } %> + + +<% end %> diff --git a/app/views/admin/ad_images/new.html.erb b/app/views/admin/ad_images/new.html.erb new file mode 100644 index 00000000..99379faa --- /dev/null +++ b/app/views/admin/ad_images/new.html.erb @@ -0,0 +1,8 @@ +<%= flash_messages %> + +<%= form_for @ad_image, :url => create_ad_image_admin_ad_banners_path, :html => { :class => 'form' ,:multipart => true} do |f| %> + + <%= render :partial => "form", :locals => { :f => f } %> + + +<% end %> diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index e2f757db..130c208d 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -29,6 +29,14 @@ <%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %> <% end -%> +<%= content_tag :li, :class => active_for_controllers('ad_banners') do -%> + <%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %> + <%= content_tag :li, link_to(t('admin.all_ad_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %> + <%= content_tag :li, link_to(t('admin.new_ad_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %> + <%= content_tag :li, link_to(t('admin.new_ad_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_banners', 'new_image') %> + +<% end -%> + <%= content_tag :li, :class => active_for_controllers('web_links', 'tags', 'web_link_categorys') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %> <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', 'tags', 'web_link_categorys')) do -%> diff --git a/config/routes.rb b/config/routes.rb index 112d96e1..99860bb6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,7 +24,14 @@ Orbit::Application.routes.draw do end end - resources :ad_banners + + resources :ad_banners do + collection do + match 'new_ad_image' => 'ad_images#new',:as => :new_ad_image,:via => :get + match 'new_ad_image' => 'ad_images#create',:as => :create_ad_image,:via => :post + end + resources :ad_images ,:except => [:show,:index] + end resources :dashboards resources :designs do collection do diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 96cbb4b9..091d21ae 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -54,14 +54,24 @@ module ParserCommon $(document).ready(function(){ $('#slideshow-#{ad_banner.title.dehumanize}').cycle({delay: -1000, fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}', timeoutFn: getTimeout }); }); " res << "
      " - ad_banner.ad_images.each do |ad_image| - res << "" + printable_ad_images = [] + ad_banner.ad_images.each do |ad_image| + if ad_image.display? + ad_image.weight.times do + printable_ad_images << ad_image + end end + end + printable_ad_images.shuffle! + printable_ad_images.each do |ad_image| #TODO Need Reflact + res << "" + end res << "
      " end fragment = Nokogiri::HTML::DocumentFragment.new(body, res) From 2fddfd367a9c3a22b9b9982df006ad5d3d5dbeb8 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Mon, 2 Apr 2012 10:50:39 +0800 Subject: [PATCH 081/125] Change for interface,form. --- app/views/admin/ad_banners/_ad_banner_tab.html.erb | 5 +++-- app/views/admin/ad_banners/_modal_ad_banner_form.html.erb | 8 ++++---- config/locales/zh_tw.yml | 5 +++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index 78645ba7..19ba5087 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -3,11 +3,12 @@

      撠箏站嚗

      <%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%> - <%= f.label :ad_fx, t('admin.ad_fx') %> + <%= f.label :ad_fx, t('admin.ad.ab_fx') %> <%= f.select :ad_fx ,AdBanner::FX_TYPES %> + <%= f.label :transition_sec, t('admin.ad.transition_sec') %> + <%= f.text_field :transition_sec,:placeholder=>"3蝘隢頛詨3000",:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %> <%= f.submit %> <%= f.submit 'Cancel',:type=>'reset' %> - <%= f.text_field :transition_sec,:placeholder=>"3蝘隢頛詨3000",:class=> "span3" %>
      <%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab} %> <%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %> diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb index 976d11a9..418b8c8f 100644 --- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb +++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb @@ -11,21 +11,21 @@
      - <%= f.label :title,:class => "control-label" %> + <%= f.label :title,t('admin.ad.title'),:class => "control-label" %>
      <%= f.text_field :title %>
      - <%= f.label :transition_sec,:class => "control-label" %> + <%= f.label :transition_sec, t('admin.ad.transition_sec'),:class => "control-label" %>
      - <%= f.text_field :transition_sec %> + <%= f.text_field :transition_sec %> <%= t("admin.ad.trans_unit_sec") %>
      - <%= f.label :ad_fx,:class => "control-label" %> + <%= f.label :ad_fx, t('admin.ad.ab_fx') %>
      <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
      diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 049be66b..a4ce62b6 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -39,6 +39,11 @@ zh_tw: admin: action: 雿 ad_banner: 撱頛芣 + ad: + title: 璅憿 + ab_fx: 頧渡寞 + transition_sec: 頧游桐 + trans_unit_sec: 蝘 add: 啣 add_item: 啣 add_language: 啣隤閮 From 7e922d8ed44b08412e90396bc5c9fce34ad81f82 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 2 Apr 2012 10:54:48 +0800 Subject: [PATCH 082/125] Fic bug from merge --- lib/parsers/parser_common.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 091d21ae..24c00684 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -49,7 +49,7 @@ module ParserCommon body.css('ad_banner').each do |banner| res = '' ad_banner = AdBanner.find(banner["id"]) rescue nil - if ad_banner && ad_banner.display? + if ad_banner res << "" From a9988a0d5cc1d8582d00d34c0d65a473c36e77c1 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Mon, 2 Apr 2012 10:50:39 +0800 Subject: [PATCH 083/125] Change for interface,form. --- app/views/admin/ad_banners/_ad_banner_tab.html.erb | 5 +++-- app/views/admin/ad_banners/_modal_ad_banner_form.html.erb | 8 ++++---- config/locales/zh_tw.yml | 5 +++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index 78645ba7..19ba5087 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -3,11 +3,12 @@

      撠箏站嚗

      <%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%> - <%= f.label :ad_fx, t('admin.ad_fx') %> + <%= f.label :ad_fx, t('admin.ad.ab_fx') %> <%= f.select :ad_fx ,AdBanner::FX_TYPES %> + <%= f.label :transition_sec, t('admin.ad.transition_sec') %> + <%= f.text_field :transition_sec,:placeholder=>"3蝘隢頛詨3000",:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %> <%= f.submit %> <%= f.submit 'Cancel',:type=>'reset' %> - <%= f.text_field :transition_sec,:placeholder=>"3蝘隢頛詨3000",:class=> "span3" %>
      <%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab} %> <%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %> diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb index 976d11a9..418b8c8f 100644 --- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb +++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb @@ -11,21 +11,21 @@
      - <%= f.label :title,:class => "control-label" %> + <%= f.label :title,t('admin.ad.title'),:class => "control-label" %>
      <%= f.text_field :title %>
      - <%= f.label :transition_sec,:class => "control-label" %> + <%= f.label :transition_sec, t('admin.ad.transition_sec'),:class => "control-label" %>
      - <%= f.text_field :transition_sec %> + <%= f.text_field :transition_sec %> <%= t("admin.ad.trans_unit_sec") %>
      - <%= f.label :ad_fx,:class => "control-label" %> + <%= f.label :ad_fx, t('admin.ad.ab_fx') %>
      <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
      diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 049be66b..a4ce62b6 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -39,6 +39,11 @@ zh_tw: admin: action: 雿 ad_banner: 撱頛芣 + ad: + title: 璅憿 + ab_fx: 頧渡寞 + transition_sec: 頧游桐 + trans_unit_sec: 蝘 add: 啣 add_item: 啣 add_language: 啣隤閮 From d8b20ae9938788afe61ebdd55dabf7b20cc60bc3 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 5 Apr 2012 11:11:48 +0800 Subject: [PATCH 084/125] fix ad_banner sidebar --- app/views/layouts/_side_bar.html.erb | 8 +++++--- config/locales/zh_tw.yml | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 130c208d..0952b202 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -31,9 +31,11 @@ <%= content_tag :li, :class => active_for_controllers('ad_banners') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %> - <%= content_tag :li, link_to(t('admin.all_ad_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %> - <%= content_tag :li, link_to(t('admin.new_ad_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %> - <%= content_tag :li, link_to(t('admin.new_ad_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_banners', 'new_image') %> + <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners')) do -%> + <%= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %> + <%= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %> + <%= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_banners', 'new_image') %> + <% end -%> <% end -%> diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index a4ce62b6..491d80e8 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -40,8 +40,11 @@ zh_tw: action: 雿 ad_banner: 撱頛芣 ad: - title: 璅憿 ab_fx: 頧渡寞 + all_banners: 頛芣剜 + new_banner: 啣頛芣 + new_image: 啣璈怠 + title: 璅憿 transition_sec: 頧游桐 trans_unit_sec: 蝘 add: 啣 From cedd782e7f7027d92700b04aa8b6049bc265e656 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 5 Apr 2012 13:55:03 +0800 Subject: [PATCH 085/125] Sidebar fix for ad_banner --- app/views/layouts/_side_bar.html.erb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 130c208d..ba67a673 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -9,7 +9,7 @@ <%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %> <%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %> <%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %> - <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('tags', 'index') if (is_manager? rescue nil) %> + <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('bulletins', 'fact_check_setting') if (is_manager? rescue nil) %> <% end -%> <% end -%> @@ -29,12 +29,13 @@ <%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %> <% end -%> -<%= content_tag :li, :class => active_for_controllers('ad_banners') do -%> +<%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %> - <%= content_tag :li, link_to(t('admin.all_ad_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %> - <%= content_tag :li, link_to(t('admin.new_ad_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %> - <%= content_tag :li, link_to(t('admin.new_ad_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_banners', 'new_image') %> - + <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images')) do -%> + <%= content_tag :li, link_to(t('admin.all_ad_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %> + <%= content_tag :li, link_to(t('admin.new_ad_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %> + <%= content_tag :li, link_to(t('admin.new_ad_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %> + <% end %> <% end -%> <%= content_tag :li, :class => active_for_controllers('web_links', 'tags', 'web_link_categorys') do -%> From 1b79400f44c9f57ae121f04fcd5222716bdbeaed Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 5 Apr 2012 14:06:58 +0800 Subject: [PATCH 086/125] Fix menu for frontend --- lib/parsers/parser_common.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 24c00684..bd05a4e8 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -102,7 +102,7 @@ module ParserCommon page_menu = body.css('.page_menu').first home = get_homepage menu = page.design.layout.menu - fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu, true)) + fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu, edit)) page_menu.swap(fragment) end From 7bf50d6c5299b11bdf132d74703c6f41378e97bc Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 5 Apr 2012 14:08:03 +0800 Subject: [PATCH 087/125] Move the audit block to the bottom --- .../back_end/bulletins/_form.html.erb | 74 ++++++++----------- 1 file changed, 32 insertions(+), 42 deletions(-) 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 2ecadbf8..4496cdef 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 @@ -4,38 +4,6 @@ <%= f.error_messages %>
      - <% if params[:action] != 'new' %> -
      -
      - -
      - -

      Audit

      -
      - - <% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin? %> -
      - <%= f.label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %> - <%= content_tag :label,:class => "radio inline" do -%> - <%= f.radio_button :is_checked, true , {:class => 'privacy'} %> - <%= t('announcement.bulletin.fact_check_pass') %> - <% end -%> - <%= content_tag :label,:class => "radio inline" do -%> - <%= f.radio_button :is_checked, false, (@bulletin.is_checked.nil?? {:checked => true, :class => 'privacy'} : {})%> - <%= t('announcement.bulletin.fact_check_not_pass') %> - <% end -%> -
      - <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %> - <%= f.text_field :not_checked_reason %> -
      - -
      - <% end %> -
      -
      - <% elsif current_user.admin? %> - <%= f.hidden_field :is_checked,:value => true%> - <% end %>
      @@ -121,7 +89,38 @@ <% end %>
      - + <% if params[:action] != 'new' %> +
      +
      + +
      + +

      Audit

      +
      + + <% if is_manager? || @bulletin.bulletin_category.authed_users('fact_check').include?(current_user) || current_user.admin? %> +
      + <%= f.label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %> + <%= content_tag :label,:class => "radio inline" do -%> + <%= f.radio_button :is_checked, true , {:class => 'privacy'} %> + <%= t('announcement.bulletin.fact_check_pass') %> + <% end -%> + <%= content_tag :label,:class => "radio inline" do -%> + <%= f.radio_button :is_checked, false, (@bulletin.is_checked.nil?? {:checked => true, :class => 'privacy'} : {})%> + <%= t('announcement.bulletin.fact_check_not_pass') %> + <% end -%> +
      + <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %> + <%= f.text_field :not_checked_reason %> +
      + +
      + <% end %> +
      +
      + <% elsif current_user.admin? %> + <%= f.hidden_field :is_checked,:value => true%> + <% end %>
      @@ -130,15 +129,6 @@
      - -
      - <%= f.label :image, t('announcement.image') %>
      - <%= f.file_field :image %> - <% if @bulletin.image.file %> - <%= check_box_tag 'bulletin[image_del]' %> - <%= t('announcement.芷文歇銝單獢') %> - <% end %> -
      <%= f.label :category %> <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %> From ccb0110b77c841864ece54eba8e745498f5c9cf7 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Apr 2012 14:48:31 +0800 Subject: [PATCH 088/125] fix announcement & add lang tab --- app/assets/images/Thumbs.db | Bin 62976 -> 0 bytes lib/fraisier/images/Thumbs.db | Bin 39936 -> 0 bytes .../back_end/bulletins_controller.rb | 2 +- .../announcement/app/models/bulletin_file.rb | 9 ++ .../_bulletin_category.html.erb | 1 - .../bulletin_categorys/quick_edit.js.erb | 3 - .../back_end/bulletins/_form.html.erb | 88 +++++++----------- .../bulletins/_form_bulletin_file.html.erb | 66 ++++++++----- .../bulletins/_form_bulletin_link.html.erb | 34 ++++--- .../announcement/config/routes.rb | 4 +- .../back_end/page_contexts/_form.html.erb | 28 ++++-- .../back_end/web_links/_form.html.erb | 69 ++++++-------- 12 files changed, 162 insertions(+), 142 deletions(-) delete mode 100644 app/assets/images/Thumbs.db delete mode 100755 lib/fraisier/images/Thumbs.db delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb diff --git a/app/assets/images/Thumbs.db b/app/assets/images/Thumbs.db deleted file mode 100644 index f9d32b5f625bf17a3cde65784f73ba03f1ea1bdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62976 zcmeFZ1zc83zv%za4bmYcARwjE9ZGkjh#=i99S@->-H3p6r<6#eG$>utNT+ne^Pk7P zJ!hYN-}jt-{^xVgJ@38m@cFJ;Yu3#Cre~h{&0?S*e?Fs}Vgd3eBML!+T*ELRsDE%r z0QYcyni~)ZBDg^YT*F|n-y9(jaQjd54^#qIAg%bI@+bkg02Bbc&d~tq01N;o01JQ( zzyZMP8xPo^2|x${v;aZ?5r7y#0w4vD0muOqfSUj+fFXbyKm%Y0$O7m9^Z*9HZ2%*H z3BU}v17HEL0@wg>*&M*u0NexI2XF$o0Nel`055jd7G;Lh;!{P+4l ze4O~z|KVc?d<=l6;XmsC@c7|lz_0#K3+`_L=m7Kp2Ec6qBjC^dA08Io|KVc>y#Lkw){tuTS1^h|_;Qb#yHpv10O8?gY{{B|~hmRldG2mDKhmQsDG2mDKHw5?a zG2lPb|KaI`_kZ{}0v`i@^?&#{0v`kZ-2Xj+n-{IZr@sA&~%~=P3dac zMdg+4$P>QWoa5Kko%FN~5EK&3&nbx3eUj8|XZ=IEbG%;`LE;k;0rfZQa|sDXbrRUd zcq8IB!x|0ar#RnANb1g3lJ9VF#eQF0toJV{F3!%9i5!Y}Cv=BfIOH>3R(I$4IBN^y zl18tNJ5ELUhos^J#v~qVlCLQOu>k=AnrL>GmKl+v=dXEvcl{xoIOZr_QoRXYC>2dB zh*B?K4uuf2GIMa0-sG23tGkLoS=W`9m$&$u#G^T7k^6dW$4BI=y5Hs8?Ow{Sf-V&q zA3_j<1{Cf#E-g{}b)R3I%niT9B5kXjpMOTdW2IRmg+V*d!uV)vLUKW^JSh_owaY-X zQj)aG%o*t=8p^;yzt|6Ci+g1G)z$I5HWT7Pu3NNTd4b+nm-&@hv4TQEUE}EkGj4NA zZZj^Vpe60Py+b7O6Fr_VCL$w|%N2LgLXb^MuBg;`JY}0?mfutulfd!x!QkMa(LIN< z;^Ht8c3nwR^FDQS=iAKOVQ4tHe)Bglu`zBNi{J3CH}I)VGk8O#oV_3B1xjV98KUJWB{RMb44v#`fW*_=an6Q6zc2?Oi<5pZ^A~U+N-`%FufI=&) zJAP6{W8+7U9W3~XiQf!F)629;O0WtECF>?9k67LleaIC0q~t@*lb4CMyvh07*n(nW zY3-ExlVwav*TMyjUMH9oG1SjTdqP!kTBUTt1u!CxRkyJT<kaz8*m0TD;g985^0_TvvEcG;MIPqjUokx5ao} z-*$_2HZESOpr8OzQ9=UYY9SJu9W%WAJae95+xY#xTM)cHUhWYM;xhffNEJTa<6~|8 z4A-Rl#z7XWR52=|XD`?qZnLtzOYP`%lg=uudxy-FbLRh=*KV5mg9ME+ar1Qi26}pm%f#m7w2~!uMeQ5Mn)uvNQxn02 zO!+e%Mx3YoQ#ZY@@*5gbl9JEXS^|+InUE^VC#JsLv9m7B3(I(DG27rlL{5HZQk*Vv zH-Y`hgo62#BF-l7+&Z_1r$f@xl9K2r3L~LjKCc?zJ$U%=U68=Ndr=j3WGZ}NR7!5j z7Z~jBhiXZJE-Yv7Pj8E_!RlN#yQYWaFU6hbIv#zIOK3n-K~KdICdCd&a%si!&Rt*+ z6BztdFD>JhJON$aL5KncOUiTmb~^?x2|{jXq>mD$xUhgea6a<`8mhPa&NLd;3Zp_l zHD?Vv@7dtzmsp^v<%%DiM!kIb(kP?lAn3K)ZvFGtU7 zqlAGdarK>Ku1+r5VuAW_=}3w@+GajJjS~bkKVzwK=A>BbCRz>GHDuT>@|0S;;&}%l#V&xis%(`!sx2 z3_D77u;^3xYy^TgDz5>K!#hufY_SWM+UFzlv8k!NL(g`}jaN^@y@-kpY(r5Uw@wfk z>C1htRWZ=9KYHxP$*EkNpUriI3QgA<>M6WVOmcG5K35d5B%vqb^6W$Ghr z`SRT)jlefj#Vf>-U!cUDK}AdZ8Ur>X>H`|i9EKErzv=Ugwc2PI(@SiRu*cN+z9dT7_BRl*c zm-54`5epZWK#+;b(4llOVhevT;3u_YH za+$Eb01eGYnskb9vuk-IWuI13kvaU3Q3&6JxpAaR4-)s?uDe#URHbyMwF@G+1%9= zlg_FTM%gbPqr;zDKVkjGk3I1zdUi7iZ#ZXnC(u~EynK*|fPif+J>fltWw74CJ^^~- zS0xiElM^Ef{%|Fn55nyCYsET0@AJ`>4BfWV#Ank~QeW5Of6XJGd5ZmPaA9~VAo%5b zyGa3wdE|B1x7kcdNmyv_o}pfP3!wMEMbTU;!J`q74-XG-$a<7ggHgqgRlx0#rmdVT ztBc-Xbu>I8_eC_$rR!B-HkB(0{y2}d0qIe&RR6%a+iVuahd|v6K1Qs2U%lm!Lsf@{ zjI((Jg1=4iTe~FKW)tC0mmxPPp-@f1M)|6YMng5f2s|j(s+(zy}vb-hGRr|sfWJs@j=h@1$rbn+6 z9T=Ig?-`b4_Q*M`OavnyyFQAXKn^#%IK3cE%d&J+G>wY27z;}a_E%SrDG1{-zBq<{ zqvw;zOTFrgtg*|YaOEvdISD$e_30`39QQO@+316d%hAY}4$2O<*?t<5YuYU;(elu+ zZc3>@G#rBd-fwTC-ePo9Aw;?C!p1KBm3Lo!ZEzUi4QvaXW5Q#(lO7GrgKRoXLP)YM{#T zq=m?N_n6zz@#}Y_PiJ3gnSFneyteRaMg6p0GCzU3XBCm*2L-i2aL_%f_x?hzJDCq( z;b~}TRmV1A8!zf{8Ga7`O!W5aSL~QFsZ%m$L6#)WGMaAfTd_ZMJ1{Zay>v%V)DhVi zD8KJCUbrK~VF|s$l2O{KyIr9MU0QgBuKY?5S^55bQWJ{F8S9gfSZ_P+*U~coIAEUIHk?zEue4_(}+4N**26vjZ)rG@8v+N2*eW=|dl|AyKR=&s6v8kH_ zSA+V+b|R}`)}zviwCl4-l2C_?8t&T~0|qH1UJ7eghlF|UMfV5dBQm^?znSAU`1y~P z@R=^uRp1AGYw{8DIXW8G{PYQ7Jm!l;;8rl9^1sqCzCq5!Rg_0Zx^#`1SX$j$M?%x%nGO1W;-cpYosco1vlBm zE6Nni-M{yYl{`UVYD9SaNK-O2P5(3Lx3jQV-Z(nCEa6ndTN~$fx-9H0*|bfo2h+|) z7GyFHt3r@5lsy|Al=pmQ^WL!KB%UHuaEXR8z0xUj@TiSdk0G$+HYaniy(zXRB>eDZ z)e#r-R2o$nh93=!46+Qr%EqAE;z*_dXu^*jRRbm0qY6uz$P zT}eK%(AT)$UR`e`ikR=xbIDB1o*$%X8uY}a2zwoG<&17q5S|_V2o+u1w8u;rYrO6--JZEnu-oL7@ZzU_ zo>3Q+X}tI%-zYOnl5Y6*2@%iix}*KgR{IEQA;*{qXJ*x+vU@9~;UgbwoyVy$zt^nX zKo_rHAGZ4u?UicbS9J2_v|w%XhdmvAQO9*z({Y!Qj$R#!GEVbjopwF!71CR`Dim>j z1B5(3&QF@%xSJ~>hY=u6+kAHR)!$o*qK`^Ofu{Ex_I$iKQl8umY3ihe!UC043w`K} zgG4J4Sqo2;GBHWP5W)8y`E<9&d+Pt z9(C?LyCLI-RfoEw zoxSlfB>L#u8a!of;SbetULO><($n3seT2HK*c6^S?Z`y@=3VX?7KxMmM@{D(Bh|K9 zQzM$@JZyRG?L38P*{GYXG zu#!&Qz_&T!i(>vYv{$iMH}3=j6J{AC@A?wrLyCwPT!#Hw#T0ux01iI1Zo_xJ2wE4(^5ShQ{qw zLQfi-%jFhM$ZK(SEVsVZq#Z-gc$x{vBnvFpx!q+cnB?mvZA@?xY3;Pv7cyL{=UhT*Xuq<{UFw^8~;-_bZ4Twdr&(>MR7Z)#&GzoY}iv z=I*}0(XP=OZ>$drQcrKdK>8bP=P`ceJZ!cIA54uq47)4LS z-Bw7@bbNgql~H!KciT3h`L0bgGM3EEjud+9(Vp+^q0rv>gatYRS4sxYQXW|c0#||s zDb$O?if5k?r#-INk&=67-7duuy1%`bU)h)=pW26^b&bzG_ZhE=hwl#lXLlaqVgAn> zL?j3@J_^CD`x2;xU{8e3k%-ejIs={lLHQ?Q^}$^RE+eM^3``PIGIEOBj7-dTSh#t3 z`S=9{A4*C|%gD;fYiMd|>pXg_Yiwd_W^Q3=<^0^m)y>_*Gw{XBpjWShLt%^%FfBn%P%ObsI02~Q1h|2?sIEfdq-zichAu9$mrPk#J9-wq=pg;QN{gh;HzWPkdyQTlY~3B-GFh z9SP|;{n3dYL}!$L!l36;-z7G38pI@F;9j`B2hZBioc*EDdmfR=xGcYudop_M}EXl5l1rEOU6TPJH}gH>k&@)6JI#3k3M6x7kh z)_9=|V@Ac|g2OndZ)TFD`=%a3yny;WAG{nIR30ImoAWZSc$CyPgq{f5l8i3L_hSmj zUCJ>*5V{!*8k2x}IiDVI6?Ahw-?V`3-ac@xKhgF0? z4q=c}jX50Xn%wTmHI^X^^4$Ukc`33xe*Gd14?6#W=9;m-hZ!mG&yJCQ3T54p>Blej zC&&L0QHh#g6<*&wY=I9SoxCKJUXjME6*-fQlo>-VT37CZuSo(f4hCxKN=T6q4 zpF>gl2b;IUg|2;L53(+dm0^&y?90uA*ew#VgJoM7#P`i5^94%e<=GSHTn-F^$wn$B z4HC)ygM&taP#WAn4sA2!I}j`|B!;n zKLpMEzok$ai z7G=?8B_;E(p5KrnBn(i4h~*Fs5xR-NzWwd7_Lu(SHCzb>%q3UU`j&Uw!as)ohx5Oz z|M{hVHv6e({!RN0*Snhm&9ouVu)=Nre_#Ln^UMca4-C|je@XvN3H+x2Uf#dta{*a= zKoiOf^zOVs?`{0^-VB@txCdN#;8pWC4P5^Xm;1~7O;3Mvgr6n(smB8LzslzWQn*1W zn1MfT;0`|z!2dHPoFGMi&%ouAf|qc8IXn%2&)*;2CBcIeT(b(yzsffO(zt={AAa(I z?`Lh?2R8h41Q+o2_sp;SV*n3-RX+Uu$mQ?)&VSDT|0CxA-S+w?uZJu%0v=O6xN%c!1zB?}S%v4I_#XCE!fI(WoM0%PeJR!C^ z)C+?kWPw@Q`sTL&p-<7QAFuZxoh=9-;7XOGi)PLsT()!-+gE!Hf|wwUOue$uCTDh5shnXD_07> zmPlNyq?{4g53ZB!MZK)4L>_leW0WCCF|tSu;~}SkkJ37?dB%_G?a{5ymn$cIl6shD zwRv%>(3eFY(HGWxK%XbrDRYX8OkES5v>Kcfc#FUw0Ta;EB(Vh*Zyp#VgQ<1yl>HS9 z5?o^N(o?x4<5F~pyTnfE4>-~JFJL!V&riSf<b%^$kIug7w|A`Ots_!0gQ<_~#D;eUDk|Ihj3f5iN8uJB-(`>UHw^_WW$ z8IMrtX~O0eJ95zt$67Vw3L<7&#~o!k#!?vMGy8(dISIGQB_tG#--W&yZ>X^bUgaj+ z!yuUnAB2B+Lh@h`^qQAqYmWxSb`kGhGe(|DHQa$g9&`l5Ab$AJJs#)2ldQgzbWE_5 z?5=VBGMo_nW}*9SZ|B96&uNEj7HOvlq%a7f4v6lbG5&|;X#V+{0@FJj_w$gVBTqIK za?wty-#xL1`nLI(Mk9w$AFN6ze6!1bA77H>W{{-*qQE#nfWKe)Xrsxk(YtIhEA6Ir z-gTx9%{fm#(#+*;@9qU9D%80*Dm64`IMyl`63yRAby{PIcUR)LhC1-BNUFX1MXL~M zuhQqX2H}@6np7W)gZ>hT9n^yFf*XF}d9|9RD}1mielu+n=lUxR{9<^vIuK7hJ< z90;wHfnOf^dK_i_w?)Qt@Fr}^EsQ7kXoN}Z48LgF`(RU_^m}U>u~p~Tx&0OP09v{G zOS55@o1tQOPoOqaQe5c>ZHP#*i6=F^jKdu=%CDlV`L<^n!2(7R2ALnC*)8eE&5~Q# z=9FH}t_q$wucS4C637+Js#HUqn(g-Zt}xAE5Y#BJJ4y3zo?P@*s;U3!=`R<7vvy6= zqCCpV>*s5p)t!?ho4qIdi>-WR#A}oG0hd&~?`-cyu+DK3*;l<4NT#K_bnG|isNKUy zqjh3!7nUpD_|QZ*QeykVG=j`-If5JQrRoyGnJQZKsXFDUj*RGs8_>1tlDqVik*E*r zKTY21d@48xgGjMkdr*%c#4dTMEqQ6zL~qMPZ;O+Q%2ZR!RKwr=x4!gVU%VAbx=BBD z4ZR{8J;ICLHn`_LZQPMGe>h?%c4(}MHcX8k2K`K*^YBy5jy{*J$7;e7h>z z=J5I(W4MLDAZzAh&AXxo*DR5z3Jp3i$V1U;7{q@c2HDd@IC6{KmWkaqUhUqvIhu;vqV^A9;CumKF54G+nUMa0Wds6#IWBt&U;L zY!eXd7%!bZeY#zP*VWJ)R)VEzh74nFHBQq{x`?9o>Jv1EKhnKf7^^AXq-L)iKC;yZ z>VV4lmYCU%<>l}W8I(s+)*F&qlIS7Cn$N&aW;))VSE|3(pG&{*Um&?W(yUr~S^qcA z-xq?FtNhP>OIFT)_$v0_JAaQ7@%#Dvr&D$}wTNc8n%YwN_qbhcQpBSR)C&WWuyPtC z^YMKAK|Jt}B?192051XX?@L|*`!ygK5CRAVgaN_<5r9ZQ6aelw2H3HHH~?G~ngD=* zACd@o3rGSa15yC*0I7g9Ksq1;kO{~FWCL;lxd3>)`M@p!z%yP1Cu$uubfKPzWfL1^opdHWw=mfz1b_2Tyum$)6 z_zLI)z$;(?FbEg|!2OQ=ZjS+b954ZZs~si*Q-Eo}3}6;82Ot37l`H`JJ75v81Xu>F z09FBOfOWtIU=skBu?_4Uzz@JKU=OelH~_%k9|8LqZ~{05oB_@O7l2E^72p~G7JZ-r zK_K&l?(<0Vc@Y!QLvALezb!p^F*n3psnKsXT+h z^s9!)#g%5;z2BTWPB(@r&pNe^&fZdNUZXd4GTr!SgUqt=LYP-{GGAml_NJ(s*vj4B z9~_geju91S#pfzp72&OCevoKq<#64=jf>8zi^WR8&^)@$H;S6tLo!8f_LJX?Qd9Jk zQz}Vlkq`+Vw#fEH-H*@c@D2Y!efh=YX@rl{)VbcB^~MJt(LrAe>7Lsgp?+@@_rrgN zE7(Yqb2rCTE zT(m3#K@t&*&mc%1l&aH9fyBftn0M)tk!V@$hGbs|kV?Lsl3AmVMPebTb-23Z1L1o7 z%gMCvySzrgMs}K?3!w;pgd!KYmA!iVOJu*s-Ax&9MlR9T2KNI3r>hOtO9+A^`iq!5 z6fAv45TpW1^d61U1S2g}GT9}+WZ`h_+@M5;;8^5jO~iIinj6Hu`IDx@(FOY-xsL=d z-%Ziz!miqj_)`w9+Kv?KNkGqy8H-D!Ot(!@9l^D^Wxy0g07D( zZ&Vc{zf_}@LS439C@5Qx9(F9aP{Py~_Gs+nF&LSjPlry@_H6r~t5qBfH5ww4YOu<$7tp+K;o(MBN6 zViuO=t0&_>Bc(8HAlAGq-RP1fY5qz!m!ZR=ZYnONe{j*DP*t;vukeXP-6|%L%h@); zyX)|P=ADh(d*>Qu%j<(>shQf7Ogo@k_&+L=qm$i_oy_wQT*u4zoG^)ra81Ew zYoosAT*1_Kzc_hyynEt$(29Wkg8qi<)yv01#!7=#@kDmKU%cY+*BlT>x7Chlx6WtY zD6z$3ame*gQ3)sPvsBU|j+0cfg_!0(t=QS3{@5LNQ4##o=y*0oq(t`$x0^h_j@W)b z6akyD4Pk{=to6+Y^U+?$FwLUj&GJo{*}AUdQ!TZOY<$(5?-Wf;MKbueg};@3RJvo$ zYG0Te_we1lmTGBa|D{V|TRYhO<1ZsGOsH?6el8|;YH7|8mU_xsWS)yl=M?!#@!bvC zC9JC2+D%p#9gX{b{+hV&hYh8Ce)K(2)qH2d@?g9tM5a(=$^%Jiz1kMGR$e%uax%{+IsFtHgBS_vIBt{W8 ztVbh}_ATKHkG&Ps;t0&~$ZYw0XdHUY7~_!xGR$ZVt12^d^3PsUVANN+!Ags;5>#_O zxP9WNqCUqv^rCU_+GTzqFn?^2F8p$U4l|>jOl?s3<;wk9N-|cJJ03hhggEYtr_Iy# z81k=bG45Cq84*w98z@rA=e}p5ch^G25qR{V9fuCAC}Ed$YqGj~AiDd@wL(n2C>s&!io1gzF|N)=PG1c7$U%K>X!ywNRRH zaDq@h5#a+7!^>_YTQ(dIg@3*p;I|^gOUriu)|SnPxO%06oa*(hO-!A9p@<%59zIR} zo0CFh;28-Jg9v{E<^txvPq}CFwf|lFPrvk!yg=Iv|I(W8r@oaNXkYIG-J>aR{Y@+S zTk8JTD_s8wPd_;TOg}%TmH*Y(zje6<9yv&VbNeM9u4&~5(z$_r_!rQoz`hT(z$QPn z(8m8ZfXF2e}Og3E({2@d}T{T|SM!^^}F@b?T{{tfUF6Yy8% z3j)9DH-C%qSNkLRy*^T*0l`u-Pcr_y+TVZW``2{%xv>A@_pkrl|NI}Z|9R%&VRNCC zPrBN!6NWRxvW2v|KG_glxkmR&m&18J$AgS%Y-Rs*Ds&--qso5b67o_>Iw&&3A^dEwyvZff}0z6R3~aq1bh!*$MvO zWYptF)XhWhazCPxZ#1md&=q~VKg;PpGaJfyc73wDt| zu-JUIuJL8TmhxFz;&bXF{poxs2o?XyIt((F+ZLROEWwoPe*8H?Oi%&8xli4Fp2k<~ z{D_WkCx_C7=`f$o#Gcb8I&kw)ci#b&b4kHL71qkvvq#OhRFlVxaW8%GMfWDzDq`6bLIaIecH+dh68`d*BVrzMH3>U0coXuYX*g_G z_rt5gD<~mSTe;SHF`HY?&8|TX_Q+un-2vzkeZ-M`>+%6tYz%r)1nP3>V>?^ICn_q@ zA}k|moBn;cgCRvZoG&6790W%T&<{qCQfSv7i}diYwcy`y-VFH`H-DF27zPo8L9|RQ zl@Ys~Q$(Th7WF=@n`v-=wKX=U6`@z7*YSDJ+A=8*U4HDalFT#@82>nd=2%SDoCjch z?&1`25+_C&SYt~GJY?eD7U_-x$GpK_4MpAxVi?yov^)EK9NSE7B*d3Hc+GZ3Rw@}$ zZo#=vpm0}~Z|Q!Euy0&%?f8~T(9QP{^3@XUnnaK8u8T`N{j^0D2k9y&yxV>5t9$d% zqm9O}Y&qIvnlFRGwbJBWs?ZXRsyBpk{c33=Lx=`^&$E&IQ(R8+O>I!lYp!3a1w*2{ z_yz3y8MDIMT%$9D3!ZWMV1Pr2s6B$c%Pla7`K49kr(20j;1k`xtkJg*ySq9BFU*p; z)8DX(i>@|VhNm27N+gNbqIn^T3Fh283ldQl)2)WmUTEggBP6a)7QI457%o6NC_!A| zD7kK+QDuq9ZFQjPKOLP>xw1G$EU=;_)jOwI*Of^RTPLL#{i=DF|HW8@7_>fxZ0{P% z^>{J@+oQy|7Q0ug$J1HUg_wp}V8dF9Uz^I;W|UonjEr{QI`{4@XLKT(XN1~oM{ONy z`%BcU+GUKA;gR+zmhf!t7~=@8$33DaIhHNiff1kM#b0ke^Bp}ZA*=l8xl`!6c*Q_C zLa2M6c2e1aG;Qd8GH0up6I-qu2ag` zv;pnxTAEwJCX0u~vy0O0MbX&wOgE*Ww{&@(w)f)#5BOJy(IUqxwq@_!=zk_AUxV$h zJe?L5B$iR!VJE$WtD+92S1R}BXNas_-x2Fy)G|upy}#L&T^Y+@UiPMQoQKxBpJ``m z18vDsYdibu(0K3K_{=D)HqIyYfslElR*3zq%+_qv$Uu0lS@$#2Fv9V}!i1RjmL5yk zcw#^k0)^kufqSDpc*Epz>|?Fa+!O&~T~eGmaZdd}^@?B4VyA0uyNTA_}-oN3u2@ zjbhEt{j>B(?b>*uS}pzhViYcm-_6eVl_c=LSY*wekG(_wG9#NNB4fu=vZKK3h08L! zCTcM=0uj>qJ=eF$L2qNY5i#DA(tPS zn8CW{-8cS8gB=fPoG)Lhj>z=jl{}Z&Fr^E?n_az13YqtQg_x^$@#R8;NuBff2F#(=|njoBpF$*B+e&2Xvt(OPEY#kee+PIA@X#JXWFK& z!WaANABUxuNtqUrUjk`&s5VY*;tv_1EMJ0^m(ZF^3?2s3j6hj>WCtl+zX7l=4|NWC_9?hce30j;0IPakc z4S!}?Qo*Z;6c}l*H}-XSNtz1`s%npW9kYxE;}~p&UUnDZ-0i}~Ed<@>|JK9ix?6V=JIyfXa4(6kc44ud*8rXK#wcJoOAOgzPTFgyChH9J6u zIi1)0VG#Y?R_+}}RC2UNtsp&>n|6!*oq5hMNW}=BN*xn9&C;kvO7O^D?=w%(0wR}{ zZcz~^G|luarleefW=AFKGr`{>hICC#NeIoV?GO+Vjn^IQds=Z10qsC+Q5I|5DL&X? z;_QsSPjHm?&DE{Ad;F#XmuO(5jyZl{NEv{ju|>Guu^3$!O8wG)W09uEc1zEC5zgnD zJo$q)*0(18qQfBfHOTqo7!i=m^p57WO$cc?IG``I63tfb$H+Neo)vF#siW=qSlZ-F zij#FFIG;wVl6yJ{o@??}5VYX!Ky@E-@915nK1}5rD)yGTm3jk??z`j`?*niRmzGg?tK_! zJjXDJk2CNFGRc|$W~6TMqqDhPTIW;D7ySoFQ{?SzPJxJ&NB#PFNk~SGn_IqRC7$RZN0p*(=EGvT*0nPUC+n(DKN2#dfk)FXDXEqdQkJ`3_y^AYV}*J! zNWm)T9$)9XBbqs^ayGqR<=L<5vUi)RDv!Y+Ugww@zV||tKGuFZPg~afQA=g*zGF_8 zgf~mz(UtuX2GIyRBFY!@00%#>t9k>3D^s)lpSW`F)jhGX(o$qUuRu*hv32?lt3jr({KYx7*-FeeZ@tPD6O7U52`RI2^+;KD zM9oQwLUJwkOb8v5tdbY8+)sEMN9mA0;>u*jq@4DS6z^iW(}X;KLoF+>5`76ixGM>C zDW0#MX|c)$uo7UPRBCe=KxjZFEFB7VTJZWRNmLH`_tse2 z>+SXvYo@)goK**#A_x(}{>Ify?IeBmEwUmF`oTRryH-Thq1_nmUyw9R4O_ZH*Q-v=yrtPHFf3kLVA0 z7}RY7_Y18yA-gDweT)TBL*@^Y9szisHQ$<+iT-;bqmF=@~b>K736)#-Fd0T`1 zd7;xmg*x|jV(2r$eVI*Fz3%I1ddHJ~?(!aDV)UaDih-Ewy|zNn=n&JvR`U@J`{a|N zQ%$#Gw|we&OB-687}BQUYp8CXJJjW?;;WNXLpxslkbte7NV=ry1g)?XnzBed#QlAPJ%XWzCzymi0`TS*B&0AHt=6HNupkc$-A<=T``%WZyr z>bKA-QW$2kQxrv$mS^QmB$wVf*>b{T6V}BNUi)?8(rVZ6qnEb&^dQMI0c_{1xlL`; z66ADG>N22RwJ=fVw16)%$XuXqLqZ@W}mS6XO5~<=0*n!u1gBz?|JT6aZa;I zO0G_86}`EsGbc8DX)Vat=H9}TROt$XFeA<8lqhgVHxJUoAkQ`5H}PV_AOt|isijSd zWfvIvQ7oS0QrLH^IZNA>f+yY1G36j6;M?9Uf%#HsJcCjYn#j49m)Y&p!va~e@R7u7 z8^UP+qyns1rr8tj8eFNOgK4N>0ai-N{L%Vsk}mpighBKt5w6QZA+(!I=THq*hQJ=@ z4VC@eNBnbl&Y=c-IksdZ3JVjdwVj(PIz0vb>eIfAMe=9U64bTl>f#p}8ZiRK=Sl48 z_eP#DMee{L;rz{CNA^9n6i&`Mp>HlNdt^a^?l~_^* za=W08!^CCk8P-rZzn=TpkPOCvN`gwz$@PQ!QCU-&J@~f z&HDH2Ew_?ajy6@L7^h4GRxOB@Z7OJvfs*<`@s>LGXpjV2iB44%nlR{}aqnxs#%^lO z+ozS;B*pnPI?U_xipU%kIySTSJ2|TB@v9Bt*p19?d_#Hj|gQ+M{XT@%g=CV!2 zcmB~4Xc`J>Z)H1mr!pA$*tAX0!&b7>0+a9^RrOwx5fV=|MwQ z*IP99`W`LI>DY;Ou3;)xCnoPB$J!?G0ON&oz?$2zgSogu9YeC)Pmok`yieoFZoc!2@X=^(~hX;Z(?@ zmV+A4T$YWF+bXQRHzU>oJOEV5*W;6CL?eL9g#I%Cz)( z^3Nqbns+JW`ivRN3fM|68MFpGAuN$6jVxQwqP(7IDaJ88Cgpi%lIA^vzb7iUrt}zM z%QT$SC;d8=@FTB~@qSKnVWek-0OHc3K%T4zjc(s$T=4eZvVW>&r6b+ygc<_k{lokn zl^+lqT?NPKYO@yU*_C$!LPU#5Jo*zU_bCsqiA7pEdsN8zvk#*N4Ken!sLH=8U@bnQ zFTw>SL5G=s2+;^cVQ}7`PYP1Ai9tAFOt0bhRoNXnORnwo3_!d zW!1nY+;%?l23t6R{)1Jq?Lk?2VaNaunv=8tl!z6UHf{HY*!kg)#0>ffsG_E88_w)$ z&H#seNf7e6$w? z{C!SJI^wnJ#uqE+X{*Y?<#r!e(&NkToR1`&F=y4lAf;8-4`fT_4s_n<$;%n1Dc`At z7DH0wj$3`XT@muX**0&D=!k7}oom!=3s4^Cui6eS;Z_Ze#4zs#9$m+y44g?TDZaz# z_YBzGMgO5I<3vs*=}`-Vm<2bF#-Q-tJxY5is_NZv9@3PZ_UE%3zwMy^V_*L(`|q3( zgn#b8|NOt2|M1_R@AV6Y^jyd^5+Q^iM|!fd_GS8UHB7QZCi+;Uqg!N#Kw#hgcI*G8 zKN3LstsjhX)sONdiyq=qz``R*Tam#6^%KAuv%0G|FUp+@%F0Oak^tddv{d|#F0sShgArl)nYUlF%$|rP-Q+W*UNim-r*bSv|Mz2?0P!! zE{;QrC3WOj?9tPw?UR!fdUi|!pJ>l7EDCjz9l*j6df?pNGc2cVLBvT9_p~8k6z3ai1Y9RmIKRleR|7F?L znZa(6=08LJhb4sSvt3eBoia``w)c=t_Ngv6rjx+-WJt0O3=*X^cjaimECu;vZ4`f; ze(5AF%_$gClnsM)vGiYmlz~CgLn_6w1Ed++IfUD30`b(;N4VNoAQF=sP9wBH<7OsHK?Fl=i69$)*J(tf>(dK0XL?_G5hVyAm(baL zN}5H(OZrPIQ`JIZX$ToH<^5v0YUd5P4V8kt0TdsDYY83bQG0VdQBv7u0Qecd846`# zh73WMh`~n!dSEMJK>#m$mm`|-mfWEKwP|^f!4JH>0(zHdq>L_Z$Odz!ALidBSBW;9j}m;#NhNofj-0CG z#}YoohuOSZeM4rspnH0|m#-i@fHS-M)|c>+W26DiDu|jC5yBHKQ0Py8D|Cu~C-rr| zr+!xK3Rx><0C7+*iAx+yRj`Va+*n-;DC5pTlDWWk7_UHKoxx?m z7O29Xg^&c%8%&aCMsSw4WKKuh0Jr*UsZaOf*ry0n`r`UuC$XTL~3d z3+b>c@3$aUXtZfpAntzKAQTturz*d5)Ne54$6G0FE!wYB(a=Pa&}YJqmP%=C`E;VQ z)Om`SF(-d=eXmHbc6!x{4*aLAHAp(v+bo`V>r&mXP6@*jZsu&S@Jqhj=DT85_ao&t ziwXH-fuZxLfU1T5R*|SHqJO7VMDlho9d)4AVb+A5?qUDt<{364M#thifTAPn&Wh9XkPM2N7%Z- z*E$gg8E%!Dm;OgNaD3nI(fn{-L=geve9-2*H-N z@ESe#D1B6CE7AF4BUL-t!v41RQfd3cUk9JSCz#EbTfFTvQ~Q8OpC7H0>gn<q|?pw)k)ZT$=@)C)!0b%5%4vp?la>pF55tEOH>M4i5{ zos2ur%b&cf8Tuo<$d{_9+m`{Tv`k^Kt_)YooVN66OHF8~E^g)`ZkgxR2}h$nJ1(@` zk$T$!94hRyh-~@E1~gEau{Bypj7_8fMbgNq9yjt4!sW!aT*PEMT}P%Q^>VIF7%HC- znJf)byzF=WZISTg-2P;ybt@Ec)5aW}&@N-(FDo0$%gY{P{OVtosv9he%8^v|P&w>W zeMgQ5EP%=?*4c9NC9TrfDoHnU49$8hqXj1{)~nq}YW(&T;#n-T#kwGHB2|RPPK%2P z>Z>YSDpy2P?H#^D)444%50&+Pl%w0SV~lr@2BJlk7XbU~gLWhP0IvO?E0(g?KPXn; ze<;>(1^c~MoTEv5?aPjK@z)BD7UsotoTyX8;3E=3s*kf~_6wlW2K(gY9GCX9BUmz> zQZL-O!9|NEVpg_{Z;Cy54$~-M_#nKD@Ms4X<$e+j4n-z&Ni$;kP(gDf9wy0B>bO0kgWWFQ~~2vNgkl!gG|S-jUAUcz8?#G2AQT`+Wlsr%X7=Eha{JC|+N!+%5I0!r<5ynehyNxo397EN3XIH|11jJ_} zO5zLl0kQX=QB+o$F-&>YGx=VV!-aR`o6D;W&(reUVJOg%B#DlDoO44LZe^q6Qi=-C z5PrC1ZAt^`ih^$`){Y1xK}WB~R3UL_H;idji?*X|s2|Ga!AOE5aV}7f-U5%Uw&tkD>`fQSpCRnZv+9z_LF{GneI?r^r+H5q}JUMmzK&7VU^^#owj8rG z`7fXu4*}K^sXPL%>}4m3r$llc9Y>f-5RvLS6H~P^B_h90`QqmLD4CqZ0rJ=|0E{Koz{}^KTuNRlWx3 zGV-$Q<6X=fkRTf0KY<3$Hz0(?rL|=Xd+p@`CO8p=5Aazo-;emA=PIXJoQ zI#8-;#l^ZuQ|d=^=!+R>$Mt`g7d(IfQrL@}1os*b$z72$NtX@EBPa1!C0_vnE}0ZY zMWT@ti4)0%E@A-V1^^+Vwz`J421}2kz$!MTytv8zqP@Iuj;$cVD3JbeG}X!vzLZ}? z%s@VVG0y?z9mf%GKvWbn2+xwgzXJn^ z+Q655{(wToNA+26Km^CX+n4u0gT8+ckcEqU2D$#6hvMIWUIp)TZ~ESV5>bKDe4Yc! z`2T=JN)JD7@h{38*6-)Bft zRG=m_ZP_I?fO;tuQt`KYc_&1@#_mEq=5rXnY#(0Vlzi~>`$M0Ff1jVrk{}1N7da*W zFAirQ`BOD#)l^3A4;u#ZukvNdN@T{(YD-jtiFJYd;-)bxZ<$2(G9e2-MS48pyJ!9d zg~IOvtV`{GHfY59{rO*mB^$Jg|AM~mcMB@)eFrce#lYzPH9%;A=q#|bhW9XsfV^&T z+d|q?`k-k<{~jndoJD;R)ZuJzfc!EuIrE0q{KWfu4W6`!Dr9d*!kD zt9&4lk7WfJBZdw&53v-HDKkv591!u`!14gArf`9e^A&(y3h>4%;7P*gAM>KmBpRl7 zw)|%Rta_m&F97jR`F}d~|NiyA*i68*<%Q6M-{OhIR z|JjC-|DTlp_xdl_U+;rl#Q=@-s!{m-i}iaZK$8gkv3{>MOXBgLtlwk*5&z5VbG`;t zf|haOtHpXrv%9oQA@?CkY?MH#P(08lwLl6GcN|U}d)RUN9^;j6oSULtjt^9H0Ze!q zxlBjd5T-bN*3rb_DY0c^61R@zhhD|yM@LHys#mK|YsaSodZ0S{`9E~p9@l*u&b;ql zJGN1N235j~wnZ-=cY5H$m%0Gi=-sJKBZCeI+_{87gKv!!F7NE4XW(OGAZ)cnw!jyM3GWJc~yR ztY-Z<$Zg(82PcF5@EXp`Rzjh|ZboA^Vf=6l46C8Mnu|xKF$egiJdHXxsUk;(;=>~J z5$9`xLFbSkbjHAUDZ(;;JNWheorYV`wsY=pMPWcrpR;Vw_bkSI3rWMr(X7w8BJ2iU z>_XZepWVyGIUPV#drJiz#*h_2lNyq;FN4}EW;eq6H=#l0snO+SNI8>$L+0TM2aKV$ zc1=5CJ}JqK$zehpo!4cS0|ilmF~)A&I_H0(oEOo(hOg+k*r<-h2Tn#oL(3`u6pHr4 z(@>84B7$r4#=}=3Gp#sVrM!FhsuSzHXVW1J$8J&q9%Fs*Fk$G*58h%y+Io8U^4kjW z`o}t^wDLyi|u z4|X!v(F)N)aI^vu%fgw2A<=@d;p$ll5aGTcT8N#D4`JqGOKf8)#k+B=0=wo)p9f-Z zzzc2OhHTtEOtzj{I9fNsoXYuX6qMX+**&cCd~4n786DC=Maex6{5aWYL)zgRHCAG(Hwy?byh?wA1c$&qm};rGi3QCGdo5%lvD_^r#}4Nax$PG0;7A^ zxkrBz`X(Medug9TBz0~mi~-M;I4Z*kQN|W%)wUU8)pj8~c(-Cx=x7ij>pKG<7|g@> z>0>`~4ouai3v@q#dv>dR8r>BdIE}uEUz8mAzN(6=D z6$q1v6sQV4Gg1vX5?2K`qT|!CvudsQ^#_#|{VcVC-Yhmb053=nRgrRG%vB{rH#^Hd zW6$1YP5)Vch~B0n6}fS}tt-mO4CiwN0;;iuq*)LCJ!s@09w+32$e!#IHteegUBIXq zKhuk7ET1#x;a4v;w=;4it;wj*x*kBO+opaz0lbRBnf|A#L-|6nJC~L8rznCm$X|d@ zZD4a=;z={;F9b_1U_NDmmDvmgLibq0g9P>L231sny(X#D>iR&mR*6WRyz;JeF>IC0 z6VEgWX`fZ_N*s!l-10^Y@%o53_T@XSBEtJT5MoXnbJVczT#}whn<|z|w;%AcxUB-q zz<~r>AXUMVFZBW;Om?6NnmKM^X^AYts=W%Z6m=J+hcVFQ6h-LC<-i!l;&XjS9*CHm zUkjbPN#C@!%7sDxrPELNNz_9n+o{K7CwM~NYCv%?6L%(ztLR3eDLBrciQ-C?y*fa1 zGl>pO&o|^_Zf!GER!zvaN>rU+fduOsO`j^JrBg7rl1o2tFF7&%5J&y`+2qtMD5O_! zUfQ-lAO8`S%eFnNDKfNwLpA?WE`r51qc(ISD3y8RORlvW`wHGfD-EA1Qk26Gv$CJ6 z4teXa@1?|5*C9gomyt3^`ePC29g53sFAAyK?+MuGG z(sqtH`xg*@1i`LSNjXLub`>0N=+Q`>@%uUyhsRkJ7y0+{l>7GMu+q$#sjUR7S!!)M zpQfPn79}7Z9Q01LtVc}kK*pK+o9zm7N+wfb9yI@of}}qZGA1jA+`fEtOtIh#0tp(H zy+(wLfE1zGMCz~GFSah1+ZEr?{;}^6=@VAa71-okuWi){ZiC@ZT-!i-it|EP?_Xpm}`$f z`(JB6^i>5`Vn&i&6$p3Rh;}kq1df8&-qxm**uLtMGP?N&v{HPr01YYz4#aSwTID#8 z(G}?#CRMw5bzux)grsEzU7V>kK-0v0kUDPk)XDJPqRe=oOT=V^)aaKB{13PQ}=47+`X9iKk0C*9Ra{A2zVb z4MJ(XtzuFWIjrxRk$G_o7Z^qmk8xZMpo{G_YEP-wqiBTibe@Z&k0zOHWsFb5cQ*cA z=hNJ&y6|zdcAo;}*qOa(HHEk63mKg@Pzz)-1SToiiy9eOC|l zVk$g5ajak$oJW55Ip{1-^%i*YzvA5W$Ph@Fc}#t^;BU;~1^Nk2X2fTPGBAyRGJB1) zo-n_zVmG61cUNbUV2j5Zz%7?4#puv8efW&|JeF0pmwQHn%Mi;oS!hQ)NUkJikS_(l z4>>zoNz}_B!2kzo&6r4BZZeZP!LdkG^E9azoEK-aW8&N3*zjG4C`KaB_Z10KH1w&E zTrO)cTW1GBTwaJ-VyRa%Fvl)0liRk>e_mS@SzTT%al?@*d#uxYZOG_=Kn|AYfkh$= z*7HJyru~;lvsp=Vo;2|8thD~r05ZiG1JslF@$t0KEa;V}-}6KT&<6ZhUkj@FXIPft zA)SyyIc`t*8^!ISm?@BJ-of5P;WYIb!h{Tgypv?~2%59rY8UHWr()?MH^QVG`6<+@ z6fbCNdpSr9ZF;Y2e3S_sp}hmhN1sb-4bwoQSUDQhfxr*EyIdMD*E!c0}<1x#2c_=zFc0PHJ?-XNh5u7Yh{v-6XQ%w3!qsPw_JH) z6GD%>ubN6v=fM|=5cBG5QV}LJX?sw9=4AAswZ<33o(kKiRd^4s8@)w&R^Yf zBbkvrhmS0xBLZU*o0O_0$#1UYVF>2MWC)oPbxk6VDYk4yA1R=>+uI!}A~?}YXp&P& z<8ll<4T9v&5l)Kf?_M+6s0pg5gGX@ED05IiQu7gdB(Va*^U5dLda%!VKX~`fl`FZR z7=>SX4Zt;+Z41;1y(Mqd(>i!(r>{$r$>8$Hh}f~`lwefB(=Tm!>cp1F6)+$8Y>6<7 z2FJ-7VXZLo`OoD6?w19qrvgcwJV*Mqb_0p>xGZRZ{LuHG9y- z2wLN5m{i86hzR>7Lc1rIx?xNyLi>|~H0ph1kg})^(2RGKS#+I9ORDK!mijK0B^Ct8 zgIdfZ9tFGZhe=*TYOQiv4bh`hEyEx$&Yt+r+grN;73Bw7)kJd8GD z0#i6`&`>o&BSltqcP4{}%9s5dlRh33Ni`#wNJ&9A?QP7kz!aY;0mchW1u90%7w!v}I7Y{Zl4ZQ5xOtr=8Xxi9NQWbIh zj|CwlXsm+cOPQG+?dGGtQQsy$lrjd&%s z6VJ+QcCDi2yD~}@`xn!YEgd`sX~K{s@l{?JmP15BdHCtIMy67_Y;?`cF>*#!UuON) zx^in~9g-aleqr#(P~*Kq=ag#K3KB|nQxVPPTOBVXP3~)&r%4U zwp%VfPfAmMJUBL2aK3GmE~#XSq|*-8J3c|~9YGO0nFu^4P@(gDNw3^oZ;v{Ur?XJO ztYKBJLnNm?S!y;3=0WgI0{wNSclDjJ2umC4$EsxgrfPh|vw%O71mUw|1hk@0(zSLi zSuH`mL*Gco^U5!O4fsNYfsO~b$g}4UUlbw0)Fob0v@y$COgxPDJh)X*4a8x0zqqPv zVYvly_SOcwRS5O9ViM+@pQgycKls~o_G~bf+PGWo8dsnJu$!RY9RR3`@@_mfoVP(0fv0^AxudSJXST$Oxb{? z#)L3YG%16kF+25T39Lc_aUI0@I9J|ySaJD|z$?}*5ZB{Z2$b()xv>k~tToNCT&iCm zBN)OEK5IE>sDK1VADnfBm>V^IE;4>Hz3B0nDq(fbSLs7UCdVoP7mR0V+6sx-^Bg>9 z%{(HaJcyuEvG%I1Zg`6aD>NGu&ABv^WTIAUBqb;TRt28`R_`Ec)hUxH%*-HpsPW^!qD>@`W%$+so zc;WFeMDIQUb~WNz3MEo!mX8uj~z6qp#X5 zga&ygXzIp@s@y*|80nutcEq0jDZZl)2L0yF8p4e#l4puVF26(KitKJoYa~MQO?@r)gGIMOGaa7y9Zn>k6p? zCJbwdV#?Bo`xh(64m8{fAKvBckho)f0>sg?@pNFCjL}u9Uz*Km@=A{%wiLisOOCLZ z0$?#dg(!-lNeK6WT~shtagEGV-c|%RX7chRcJ185mhJlUBMaLYpfc}pR_ujV=!Bd! z)eL6j`X7wH7Qo;3t(BMb3}0F0F>R|pfi<6#m?e@L%1j||TMfxfkuIK5A%(*@D#i)Y zZt0_FHdAR8Wd1@`d1xotH9|SwnJ*O$^P({~XmDg9?+{rX$c;@fum3ouUJM6Ff z1kdc{Wkpn3L*XWmE0XNe}}EPv}Qg@DU#~Spv0Y=V!>UL5+_B(s?h6N(3BOEJ9UI& zd=TDmq1xU-7DGKwa2OvU!P?jWH)zX7%z8xnS)e=J8o~mrFiSftGcJ?WsWnN|q>Yn64O7KeBMf4F zZuTwrxLP0$s1=_12k|FP{WgV+e<~g&LL!w0um(XB`5#gGplUfI{zNk#2?^P?kF{c* z5umUtrFIA?k6G3R&U(RVUtxM5elqrP;mFGm(&26}3f{VAhUzAdPbShp4)KhQ@ zA3v2jSy^P^R0>;cXTcM*q&k48yhm!Rir|=j^i;u4`#g3HTYo+lSFpQk!7jEYLxMP2 zCdYJS?4W&)CXgGmm&m~~5himS^Dd#+ z@ML^sj^r}SC~fr?S-e1Y)xvjV@WBkR{El z#QrX}r73O|r#aas7uiytkR($5)cIUeTp(E{Mt18!YSVKb`4{_j?PmEIUpQt7$L8lP zwyFA5p6QsL7*CXZ{%eJ8on~n6%a1DC@v@$vRS~M={ax3^C>+=`FCFwO*mqxb3eK z_PRmNgp*8-9ljiW;J7?T*wpVB9dk<*^NKc!*l$U~N`Mzy;zG2r5zTA+`16)7P?P)T zmtEGzO+R`<=OKetialM#zGiyQq=-9qg2@#>J(va$7MC2a?VE-3&HypmNd0(A3c_-l zpvFOb8;b#oZKA&Z#*^`@KFtNzgeX(g&NV?o6%(9Z_VO;{tTz0p5;}5X+ifCi?g@CC zD2okb)+>xMdQPciavI5YMCyGwE^i}#cYF^}FQ3P6Txvx%5O5{QmXkq^h7^^)BhWl# zx35^_KGzh;5Tj)hukbbz8qJV8&4H2)BdMqAgj$*U;_>LgmS?3NuS^^j1FB_8ge84A z(Oyr-2QT-cRc~LHE6-kKYbxqOPBKWVuaRjCD06iYudRJ}Z+Cn)2ktx(C%mt89f`uJ zs*7^r$ro&7E=RZD{JyoGt@ymow1yPz?;ggnO}2^-vI=$(^3Br0(4~mfNwH+1>C}dL z)TvaWIU!Z&5~nPA1eTB4=Yu10G|c4rx9TyBP(@UM?W=&ISXIJe^ z>GS-=^rsm_3|H%s5SAqQDzn>4kc30fJy=qjtaX4$DuvJA|7aLIX3O8ac8*TdvfrlG ze8cOy+To2~!dI)D?zyBcFPT!)kxg*RjBeYCKEHaWUfTX*%OZRI@(e}df-^(9_b_l2 zW7U)Nt7G8EgWpVN56FQ1aA1Lt=7=c>MKTrFg%h^B!s?De)?CUXZlxVRr2U+e1mPy0 z_R9zC#m}Vdxp(w#Bj2o+tIhRU@5gIG#lB=Jmm+9%sSmv3dqH$OoqHL5ufFPJY4f_@ z8iSWV7C+$cd@uEaSNF_*e$cpWILI%|*l zewTaJQy$YAl5XmJxInikV^#)q+)5iU(zpb}XNw66YufHgQVrkou#p6LFpCq zySBUPX`PdHn<{e%YzC{I9Ca_$S6=aabl!11(j}+7IugokE4Zh zA4b$i$MxWeS6f6Vs%Lc?(%e z;X}yg?P}>(A-LfjGs3LtjoV38WBra^Dw;u8b*U@%s*c3XKt&dxe1fOXjl|KC6EgFE@$A zF5LxEgC^S#arp0~oa;zz1kuJuIIZen>e#pa`H56dqd^I=!;}-%2rc5Cj1ckN#^Fjj z&Nyl%KJJ>@Ef#YqiPh=G$14WWFW**Ms<0K%y|T*uNPgPG+dDAfe}tPGe^~tf3&buX z?~0|Y>)S%i1>@a8`+6UttyEHo5F*`dG2(6XG^hTN8ChJy>p9HBk8w{n^gU>plFms~ zE11jHJ7nbDRJkymv0Vzf14@d+)D~ymQaJr@uSzACHRzGB_xI z9{DZb7$A=mAe#}uc=sNI?VbDY&k}J0%EkPTfB&cN@AChY{O9(ce*BwE9N@V8U+*jZ zmT&Zjw0GHt0Ny=zfc*D*a{x;89{rB|Ic^jkg*;Eexj{R;u-TK#YG-(&5)$9;R} z`!fK1-h1Ia65Kl@AS<9Of0y3*|Nc+w-v+o?`d|EqzwN)EfAt5cA>Ki_H$?8gu>bl3 z{wDW_{r4x3*E?77zk7cRx%@Z(G+d=pUm~B&-pkv?9+dDsqr4!JS}2hZFdGS3i&-84 ziLu`56eg17$U4&{g^Kof)GXl@8VhR+Z38fE`~0F+xO<_+y3!?5s~ypRJPGMJWHEC@ zH1NQIr__#&iZfo9)6sOdX|H`h-u?oavE8-l)pcI4$LqssuP4rV+BVARm8nlRH#bVk z%F?=d{Pa*9s&r}z<`xzOToGs+=OOr0qgd02li&H(R=NDI>a<&^!EH$rrR1r;71Zt~ zRN-U|%G#+wuZacU>ynL;bTrmS3_5rc(RZnfyAr3eu=6M`SrCm}ggt|r?rs>v=((IV zjA47Nom0T*J>6HFUognYb5MiY_ToO#lJ6EO0YQyJcOO#%A$(XFu_8TvoHKwKma^0R;$JcxUYoB-DRJ#w z!t}%Pm=ZZENjcMq&tV5rbk1bbF94!$MDqGZF1{)+Ui=r2U_V7jUx}qU8LQLM1K7T0 zi!;_Xt&;fJp<+9alYqcp9h@{*X*h)IH_k8g6D%yO^0*yVwXk4fq$o7!c+K{QF-n{K zK1UckLO9-jc=(8*8j2MN3?)GL#gjk6KpeApWR71i3R!GcIIR6ZvDUqxtec-QJ&M|k zmAT*Ii0NdYz|uDW;^r>^k!o*$E!|9{v&Ud-hFDyEuq7E=b84EVzJ7GnWv`=uW29B9 z6hJD+&4jjIt{)?(_*~T7Emf=_j?L{%lfOU}^gV*EIdsa3H}V{MoWZqCj=l2M$%S%M ztOy@YGxW6m$!4j+HtWs1yCN#pUIejzhg0R?oF2P_>}WCoflrKiL5f`6j6iE!hbZnG z3aBU2&&F&vQckt=pA zfA&NKcSqWSh~CCTx-|00PL$Sr{`P~mgeX|i&i+PZgO(&Dl*Ac1DpNYBs>QIe;O-UEG>u|kM?@wLsjuZ#op$M4C z@?3!aT6=1yGI*RBIf&*y-C)XXXQ*h}!~S7oHdofY|8$TWvyfAXV7HO&yw-d8wbp!^ zOrzDc$~luDcZao$n#1M7p^|b9mAlORHa9lY=hf||#qG-Eae`KpQbSuZ>{Rjf#elxn zXb7430i*&Nv`JsZOBZN-%{bXRQKeMvJ6pV?lhe;1$|Yv=nQgT@5USMOHy;pq1juDG zm4<)L&x=kMNGnF?++yz114pPFhXfGjo!YpFAeULvNXW3XK!MM1!0oa2q^&<)U*ue5 zx$R*I$D)~Sb_dn!y(%Z{j0cn4MZ7elcV^4jeA$+>OOu{qZ|4iKY1{-47b3d87{H(Q zx?2^6a0_>yj*>J#U1^P!}yEPvUy&U0wJ3HAtT-> zbHR&PUeWRDF6_WR0D?J41}ifZ&`emEFPZ#9CuY;>c&@B=H%LZ;)28s}B{1xT15RfI zu$hHB*Y@O|&l>_OT+{86rSg4af;q?^1(y#tkAXKV?u7^~K%t^=dV9H}1~k-=mpp6} z{v1e=3vz^onYtp)SCS^Us6$*3Gy2xXsCLe~IFASI5IM{@lO~>=Tal0sZcyNzp@-7dAANxVNk=QbUj^FXSu47iT zQnUL(k6L>?7)MVb=^s6p;BqH`jHa<#b{6fy?=klsOSL;%fJdp0ZO24Tw3pG?$&X05 z&uhEfcuXxUh*{2+4mHJK0TqNkn6EZF%^Ztx)lL1(%{oVQ;A#VCp~kZwaz>Hllwk~S z0Uh9Jems761Gi^urN*>@Q3p8icE5d)yDp5lROs&9y*D?8?+4ztdp0PaV$%;^KPvca zaUeM}n(%>bXiXQUGDxU9=!>mX8!x&njFQRTP#%9p22!{2h+v3K4LkHlxIMU#X`G6g zuLdVxE06cW{)(aIY&bKX>IOx=vo>3OJRGt5J4dn~j9u)Cb(Iuo%A-x=b(1TUy!5jq zU+&8)!sXB^q$B`6hL)?hR(XRU!bfrR8G$zsQc-ENfWRX!I2at8%_;@k=I(4=_9L5> zT)4GH1+)DnDb@*C(VlC~IO3#|YMDRx=U~_iu^5H5rBr>>fm+c_YwvfA;l?-^rJD}M zGtSfjt#UDCmcLO-(0Xbh7Yfvk;l_vWaFrA=;Sj@iGE^xC8MR~s{C-_y{7!ECP7`|W z-r(38-q-!XD*tnl>U6=edX#hp__!pG=fZwGHD}4dhF!xwHfI$fU)Ix~sDUa{vzUQzAS%!@ocKk^=ha~6ES;(#vfM(FH1~k}t)pFhx+^-<%lTme5(?t}!)vW)Oarrq4= zWvrahe&7?3W45}2(W*?;14fmx)$WsNbwej8>3aC=$BTX9jZIgB>S4F5Nzz3LA-rT> z1;XcB4YYP2bK~Wri&>yuAGfch9zv}v(`1QuJM=SMp#%$UiA!4MCS2DjLqC^dl`C?p z4lY4OmpoV&7iHxOkZQXVl_#Ma=f_tkxK)QCv&Rr|eio{$#6`yDQsuXmT)jKBIyhCA2i;x4A!t!82ofYBg>u26*1MwLRlUpA0eq+T7PU$l(9*fe@~yN zPz|(P>4AX^D*rrIG-^tr{}Epy1AV(DKx&&9PiFp&c|fz0uOIp8@YdgPw_vsQ>cwzT zguVM%+O)lTB!pMiBOD}Yu zzrTOE-zIXtq~fJJ_=Fo|YeDjh+1~Zx%tOz}VSeAV`RzgdiDb$~kashmFZ*c-EU5M* z;&;`(+NoN$yV|nEiuN+G8=|w!7>1LXL2lQsg<>jIV5y5oju9BpGMss_Ul>)$b}yDb zFXi}hX^Set-)b}t^EnyQykz|NFA9T_gZ%5A5kg4{j|TWBI6jLik_95zVWki4o7PWF zEK>#)3w^7hD%g3lOUP1M*vrV;jO1D;C@73{xXa&Hsy)~!7UFF$OE3OWH1A$BF zih+H)STvuvoO|Ptx{e(SHIca6sI7B}sN4Ckmf6JO1Y(rQclM!4iw3u}XE+59>Faq( z^fCFWdr^7j`;DRrpeTQWG9D`PG^)+7v}*+qdF5&Y5iE#MCYu-RgMq!2Eu0i z9gjXo3on9e1>cC$a{N?--HmCgYk+Dvk00A0%nyBVv%@@<9&T+B3SrX1AvDkbL{GER zGXiJw!&nBi0`3=JClIg#RUztvDV~{==mK`ZJ;&SUORB7|w*0#SK-_)-Ccr#R?!#MI zXf)hHjYBS2{Rl3MllcQ4i>(?b|Gr= zF4N1UyoAcSbNAQ0aE%`|{#PG)_1q&k{S-A9zaOvPS3&4z6YOpaX99QtTp`b+!z@Q<(TZhLT@AqP39#;w%g+CRE`M=vHjQxpT`FUuqh!6_3XA5;Kgrz{uU8l27Uuc6gueYU z14)$XXBu8a%*o}&lVv1%K>wUv5tWao!cl_Z5)?Z>4V-Cdb11LiM%#T9Q zqy;J!jTq=K=CxJPV;B5v+t-n|qc+t_J~YTn=Ss{M^k0joHketC4-)#F4bD0zOQ@#L zT+zaT1oI#}ZL-C09vm+{Op+JJJp5-RR#iNgJE;cht=BCGhiUuHKZE!mY%SI=M3<5` zjSatDIxL0EgAlR5&}`R644^A1(#`jCU&WS9S8O=N;DSY*=X@WA%wwTlJ<+Zqza6;`X&5w6Yiq%p)&8hx9( zz&RON=xyBNGAH`h@W2k<+5sM_IqBMll;9Q+r^iB6Au?fsX@OHhQ%^q!k!iT>Jy_wG zYnz@t8$5x>{Btrx3jC2&A$ZUL3>bohy6NT1<)<#Tt+6T~zlwl>FQ+wghK?TCAk-Xa zn#pf9TQD27=oJ+SHl05@8~jc`l!VryKnQCD6~{*MWSoF00qL+y>`@8W(fe9Q(HkaV z7}RM)`9qj#gt1nX)o}YKdG_qo0pHAoUtBI=VdF2P!QvA3YBbL-!91TwKCT z;G4UZ?Xz0eVFUlXNMJroo7q*|Y81nWYHw%=d2j`p5D`5e&KJLSa@#C0GQYz-xM%MwtQIkql$Gs<< zZzt5re9a`an9;T8h0QyA;B?i>;{swi1SCCY1gH}#kL6VL>eiI2Za3DFEGtJQ;U%$yUDc+USemvrbahNg9fgVIiP}GydYri6NFy1OvZKgJ3je8GnVRc1$wmcgy5GQ0m z>90ToUC03%hK2jW4`bFqK`ip1W1MwuUh0{d9hhZuwagFE+D_`n zPc(LVOY%5YndSxg^J3!R_4oIKd*4$=choy8IZq%zL&PWy7mJs#4|HxII(Zd7er)5g zmh(R{TiSU_5|mv%yn8yEGUX@7Y7;nApa9_?e~DZ_eU*VI$h&T`qVPj5potG2$Xo*g zxW++Cf=1H?m*y_7#eSBqb|kPE8y!tZNyV?CGtrZ|_pq57rdM-*BA3R}}K&YMzKYu1~ivjc@zt$41Q;j~^?#ihX^i+KPWM9Q^!t11VRc zOFn@=%u}|ws9wjB@BEgjVwk!2Wb7V)Bn%hP&IKo;5i8M(_GS-+l|SKHhDzbkV$pagDx^RY$?RX%PZ(}%&nA&Z|Qj4&%4ydhVI=Xv^tNiAZrjkL zV=Vkx#0y^^ccYkx`chL9)FMvAKY4#W-C{So3!A@u1>3*;iQ9Vu0scO0|C{Ec-|P2E zf7uhV$MVac;5ZZh#rl0WK+2!|YwN*V?=hSH-TFP~>tFn9nwpkc%9z^w8KbmABv?#M zQe-=GONS)6WVprXF#eFxz~2$&XdwAWHY~l+9=8;~zaW8i`4d2T{opHM{4A1Q&@V<- z6;{A%NcVO0W$W?Q{!_%Z$HeGbC8v=r^6jfh*;UzDbrfKBVZlt&$2`+WVx6CxLuZu! zlBPI^{Zg(ojqaLBD_1;gF=SEK-2Y(Qr1jd|-NjnB@5)o2De{3x2=a9qFJ?byVn1O1 zIA~-SWIj9WoX2O~-S*8C7?>BzSD`r2ldmIXWS5Ty722|TE*28>k+os@MO{=hWa8{D zx2;V(&NovqP5?zPU@QzBk!UcFSk7qBqy|vatHYt8p)xg^f@q^T1d+op0k&`Hegd5s zu;4$Zr$1akeggF_5Z@32J>Xrg4xzX2s?<|wkhX&92RmjzB2$rLmCZW`8O|Ea5Ovquq5TJMaUS3`YM@OHkEC^Di4BXtXOvj}Ov7>T2I?_*y?M-GM zA0N323JWhDsp-G9uAR>0}; z@^+;RaQ6fU2f=N8UMdOAjM#d830ZJ!6$LgKK)7*CK#BT(x6+J`IEwOALpGgbPw1B? zYFt`Y=9fxL>eGtHEeHN1vQd&?DOKD-p9{u}_ZaH5Y|uht&H{(+X4|q7(6a#X~zI2m;^q z{RNkaJK7(PtB3xR^6F9Qn z)7#ry3|Fga2EtK$fE2nKh`3ok14$A^Ld?VBJ2WJ2Wox_Lf{%P}=%VWugd={j|Fw3Q zBEKF_-_g_GUP$gG3O+#-RZ!Z&%HXZME6p!Ge-EORI0H>qE(eDy(eDhyri%P=&Ox{HL_Uk4x@rqH@EHB#Dwa-h)=i8G^coa^*lD6 zftM9W;N&F3^pB))ELf4js$xtXZ^mG&J;)fB`bB^H(4SR|m_`Bm5rs*$d3?2BXa#J~ z8SUR{j#vTBt4U*1-M5wIm@$_h?F!+xEV+*K;0sL}FC0I3wbo{PesHIKi+i*E%Vo`9 zGj6j(ooqi%?5uT>wsTZ-NUf-u^A5|zLwN6#(;8rHnmpU)AVX&~F3oQSalsaK zvvtgMGbbVIm)^qZez^xUROxPw#aQo_0SE@2RBn`e_!#<_A(dBrK`oGdtJt%5Z=+r! zuLxvF4_kj$`*)SI#l1e92#hb~a%5w1jHXbJjqNGZ35{l9pT*r1n1w-B^ny5FB<>h1M%(&@$QN89*yzu(tpSQVFYlo z89?mg_w-vnBf#6@y{7Lz7w@qr*#S8wfLsPZOT3ro@6vy#{?mYq`Tljm-||`hYWsIT znD^L^e@2~T{G$x-J|TaX{yXw#0T+AytNnk^Up{~312txF#7?$0{wK^|Xn^_acllcZ z{rTRdABqPE_;%Yl{ssO;1N=<#hyRKRqy2jf@_&baflc1=ubAYo#43qi0mR@M9a`i~ zp`ZP1L5bSXn)rg1wP-XnWu>K{T`q{8AG##O+$QYUp#2fcE9c+%Zwc;9ZP?XOc^o(B ztC_EiO--5Ym6eSRmR;NZ;j@9SLBD;r#U9+RrqLXc$p($imJTDa!*^%x%)&c0X-9)< zX7hywuzVdGLG!{I1$llk*LVe8s{`9WD6Mc`uiX(Y;P!&;<#YUjE7&}(yGi8NX|J4N|qp!lQ1A6AXy|SIZ9MOG7LFLMg$~B2_hgOIZ74< zBqKTJD49WgHEuoWp0nS%_r3Mj+UMqm7@H(gy_)%8_%|GPfACm5vz8>jUKWj;$w z<(}w7&bXVB4?f2Lmxx}1{%H&*xTVl5JWH?TI~HB;IYxXYSs|ZuYY*oU!X9S2$!)^a z;!V_b<$1cf0Zn^`mv5hIA+j$=yNTY1TqZ^>zPe_~LfoRB#XD`8tN3OtD}3go@X4Yg zt8j*a=!se0hgkSv{-eaRVetsBv9eE{@m!V8?80^u{Q9Zls~F^T=-G` ziM|!AVCDD9A3}^Oe@ZPALqo&k-W@QTGm!0&p;1iP`lzCk`ZZkpmHyJt`$x~n^;~u1 z#lj!q{xSa3{{N@g|6ScarEaqEPu^1DlQQO8S#>2vDN_?gOKKV}efr`HZitD4^o=6c zb6;nJqgn6f(DEdXLxNX*=Q6+Sk1?=!C{M#E+k^50%@3AP7=ynk9pt|Xzw9qL*x}#R zKhA)C+yBA-qco?2AZ20D>p=N{76Nuq1e}xLk6y^{`hSMvg5%-;H`3n+`#weqHbMB6 ze^f6+1lW0Akm7H>4pVS8MnBdBz_0%*{7>vJ322Gj3Msts?q)$9^ z@5W2LeGRYn(D`M-Mfm^8^kdLJ{fDC z=Y=ms1|g#R@q(r?M{_)Jvd^m33;|)>JzMro>|sL^X7grqKO-ZP!q%_SQqq+!xp$jO zlvvHtJBF{lAtSQ9t?-)b09ik^=RUPJg`A?_=Bk|Zuyb(e6<@AiPC<(Fdi7KvRd2fu z1P2EX_>J}t4EVF{fB--cAOsKwhyX+ZVt^X}aexE> z4v+*$0d4}M0k;4$fZG6BfE+*`a0j3OPy{FelmRLLRG!s9d>5b&xChVxXackV+5jEE zeZT{NEIzzkpxumGTrZwX>6fHlAdU<<(fNfG5BUfB<*{d;mQ~1qE)wP&2C3XvmbS>38B;4aeU3Dy4>E(=iG( z`a<4*|Ncl*eo{j^5&OAT(~WVg)#gAPTPG(cGUp_?QFB0zKL&waXIGcItD)gc*XhCf z(R71Xt^7q!g9m z%>A!q=GWKP;a+Ql1!)6$D&MVl=h{dV6cik(X=tXOUE8|Yn(hdrcWNKi8>F#-```WC zhu(;7o|{=$SC>&#v^nX8JoLJFoettN67VInouP=l1HPZ()Xg?uTYzp*A9#@)KLbhT zsbrz{oCtm8ceYAf9B ztLdkU8M^~9JHj`i&G1i(_#xX2XLOfqTCt*?{I+rGY@8_xFcA}z{tgKrDWcY&=GQ+} z4yOqaes3e2kJLNR zQirxsvfho!+M_*%c+L;tq9a+`eM?l*1#N}QFUR4A^F_El&*ZGIuy+r{fe=XNT20lt zc`HLCls;o5yaUs zfsE+9qDdN)Sl#20f&Trd&pt36RnRt{)&x6xjh&9 zv;<2J&})nGBgZLCg=ThO=PTyMmt&wgIUVH0IG2PpV9GqgW~n>b(>}iBHE^ z%8R@P2-UY?wO3i6BuY+OoqC0+UF|HvXe}h*HuG?+pUK6zy;hW)x>Rd9P#-^=)6{K# zH6dKORp}+d^umxQ98a~U&+ZodJ~8CDT17~pzQyP5-R20&kne(!Sox+?LgBGKuW1X`(-tz?U`RFf%u)H7Of&*SxTDqx=eU!Zu{ zo;5_-(K83`jagZ9c)9kyCT7lNRkV{$78qU0>Z~=sYnm)J#~S>6Xm&}-)gf?p2xfOj zgJ$5uW1A{kS+TPW3|$qwTaZWj#fVpu{T0t9QdB0?g&4%thMg5{w-aIFeU&_E9jZoU zT!-M!s>p9wc>79GalGzfgXc2lW@YV*>)nwrm$LUrYKZz~@@dpGN&Vhcb>4pH82)|u z=DY?~Hl-iQVj*>s9ACg;*B#q<5*Le`=G9pzMCCS};UP3?+NMAm zLCKB?`mOq75)_mXWwv28RrR^@j8qPKmZ{?gDv?&cJ<;EybE0(?3vrJLYnC-hAR{BI zcR1dewSG-m5}n?$ZX&9R=xO><3%VG@+ap%c($(eKm~@gDzu3sx%g$VQk@|%yZl`aw z3w*cJ@Kj{)GR-J(pa83VEnq!d=e*kgQXkX`^Cf$P`0)aXN}aD`wp}aQ4xUgJf82tn zL{EEIqRO53a8TDjzSX?N5ToUWoTzi#idTf*Cwa3m(?YQ$zPn)M zEJ^DcpP9y;ETB_3+1lavg-8E&TwGjR6;X*nV_GnjeeWE(9ackxs&Z&Hv;-yk^<#Yz zA;I}%DR=cfza5Csdd5M8`$nlA(qR}osdGGLB+<^!fzB0%Oy_Fq)w>_yH=q@7Zm)B+ z%p!l>{kcnO&Mzkj#kytP3k!D3hy^@z1g2lvInlm}!P+poM;ASGGc4LI1y9uDaD%?A ztSq^YQdG5qw}-#1^m(R@;)7IlUDgPBfn#Ttsy$&$M$$e~M%*ikG8ya9=?1d(I+}Z) zFUSlGT%RtZ*-MBWF&>W~rKy0=cC+sgU-%w7czvP8b@;`5`Ca-^UskOMen~zb#U|XK zC-l=EK@pkm%4vFGmMB|Rbx$m+-~X%sM*DL-O^7jXZz&>jC~cA%EQUp51G;Ij)axRS%bsAKUOFHKzH$rm#n?c|b%2zS6f%kIk#sR@(~A zwuQW_L<<_cmOaT?w_7U8b|k_oUfPNAC44Oh-4JUvR>2?v!LmEu8b$Kyn!qE%H5WzR zE;>bq*p+Nw)fEH6b2eA2U8epzy`l$kt5nq%QRl}tC9A+`$33mibTn^kNAZRG^lg-v zE6kg7OKg(W;rqip1K$?s$Lqc9(fV|yXm{kEwJ`+AO2?ToUiP0*g{=Uum2CeFu3m~G zEhBt|F3;+7)w=aN#Fl_uWj4yMGFoR!plG;={R_vdl;?(u{^D;l!jYdbK25(iwPr}P-(0DDiOS@G)$#Z~F;f_5RHB0I)kw_`mw|(!zhTG&82jk(b&x|!g z2bVNWCx$~A6(a+yS-;X3d0D)C7(ZevR;=wTjtBAV%k{iAv>2EdL>d#PO!gJ)@N}-U z*J6LXMuvNa|?l#QoBWrbt9 za3N}}w!J1dd*0(a1gj&LX_%V1?r!w-*P*3L=RS0k^((N%Z*g43{K-nUhquUYr<-O* z?b>$?6nTlv&M}75Lgbd}Xl9EGO%5%~YdEE1{lTMG5Lbk>p&+n8t?jVY?)=nLI zv)3vT`tlcA*lbkM7ru(+>(Z6?x+V#-$n#3d_0r{)+k9}rHu2azX+CEuD^IS%dlyw_ zi)M;c#rTv?&hLRdPO?r^BfEWP#uV4Q!L{)%1%(SQtM=y#f(-bqf$^DStX$RGMvvri zYuk_UxL=G#@iD~L7gR_(Yb-)?o{immHu0>e5}6kYL0TMQ)>FXIm@A0Mkt~Hbq*Qhm z)pmh%3G)X3lHQWh?73^zS)SShXCw~|Z7Cj9MNec#an&0ezoyA=pFpsR%+qK5@EG^+ zI#q*cbv2d;g%!5!;F~-CmE~p*ipl8P=(g z?3Sq3^c|w9Z7NiH@irdB72X0Iz~BkBT(_hMWDQ;7bAiUW660d2F8lGm_mRj$miM^& z&%#@;G58)RdxE1LD*vUf5qp@0HvA@p!4$)JJ0-a{gmPDrV@B4P4|7;(FP~toNgZ?; z6nS+)NRr|^#7Ie0ENYCdUw(d1sW{zU^!iHp zJvMkO(ecPis;A0#2-@Dx!KXBlUDl`f(UHvMe)pMj9-GF*h0x0=BeI7ZM*oX@s^7IX zS+$jZTa!gw#yZB{b+3g5xJaR2x5Mgq56`)3sw?S5UbGUaNaoB(wbwRYoNVC^B3f2Y zO(|Jzv+`8`JUnneST90B>ak~a0wXraqvU!o!n#$0j}Fb!$qpf%kD+5P+3wM1;9M%J`tBJ=PSm@&@~>vkzb5v| z9F-`1J`>-CwNl@@FxRJbB<-CjTE?4pTh`>8lG~#;cn}?H|C5tzECbmwXzfbPYRH!x zkPc=4B*@qfYiL{pZJSlkfF6?}Ib#Ve!QQ4m*W6V*?gOl?B~5MMI^JZvheP`PuuzHH z)v6cc($sHMQ)U|j5KQyC1JJ+7FWY2k-PpgDyyUF$7zKs@Ta5C9Hvz{}6uJsl@R9(}* zR2Qme{=t7@T&eGcHxXUH%<@hKfyr>i+7xZtxXQ>ie(RT!-2B4AV_(jYBT=3zecMk4 z<+R%5-AAPDj=xmI_3%XXChc=$-d~54aakB~AF__Z`t*+$;Eio+xEB%FPU!O?3DIbK)OICt^ds}Zb*eQng3b5YLD`L7uq z6$u8tebT9KaPJ!2)Zt`R5Vu03w;3>d%%tv{Aa$m;aB#M(pKcIQF+wtahq)q6&h!$U zAiL}w$1sBGyf2-!4*N!!?c=pWQ$O2sy%B7Qa5<+lJP0DC&w$tS>bEzZm*%L92F`%8 zVYaa23gR<;ce%-$GK_T&ldgRKW#D33rd5J7g{t0zPTprNm!BAI$fEnOf~U`r|1F6( zN~LhR`Ja-i6}h2|G?~B{zw%~ zZJkz@Dc!kU9M7|Kmtc-H{LDMwtE|oaU@Ai+OcqCQ)VTME(6jJF>pBHT5@dYW;Ax%o zJf69dMQc*|aGn>#CU4Kl6O*=k}u~>!nUcP6Dsj`{hy!5ypvFrPd1?2>hyyxBi(EgF&4ZO_** z6it#EfR6=>=wLn3DzJ7JOek4NAQvqPpdjD7bt`(}vKjn-*G_zd#jF=Kmqd?1X!GRF z9HQKzaF_AT11981+HpdMitV>dyE3`>e&wB(53G@mJ{bg22w_)QrJcr5CQ;7XcgSFe z7?M~lTq#wLlFSl#iT3eJCe3pOq`K_#Sk+Y~m2d5r>M?Iby>!$2WPEk%x(nM4dbQEd zXix6?u*;}P;zH7f29IHL+!1vcd>>|2hzu;luA<9jd$umPusP%)=c+$9ax1e}u))^1 z1JWzZvmddKp2_#${R(Ru)xe$5Hct0CoEUR7s4I#CLIVeN($fUX(={Te^l|9l_3N5S{iYmL+Rk1&3Ag}DAXe*VwUub%#O{G8U)Kewe6 zeOvoTJa}+;s4|!WGBH7WdK(V>Y+^%}^NVZ5NtD(6aYPO*;Qcx0odcy&Z%e-Id$;=t zk8u>oN)M#iljI?by^GYUcb3t{b-l=?zR4b|V!&lo+$`)LA}vCS-RU}Z^Z&k~E~NI# zNk~vY^R$SU@Ea6)ocuQ}cnkGmpKAXkVadL}NCrR3IU`V>vkL z)nNvn)jv3?7NI8`6DUW1_z-EVr_yMzQ$Dsf?05KKZr=4I8aYCK8y^qC{L6)__CRr3 z&nBzBeG7rwgoZmCtRYk;o;e0zBS`8nPg5xH8gBeE$qp8l&QtpH25a-bbBKLiAk}yY zr@+=oMzV^gb2-myxlp>5gmWw<&{RtUDh1m=dVTtL!}iG?9|^A(XKd)%diLu_SZx(u z@^Z*+-+dTxUHO+|zut7bi$uG_sM_DCxDOll;kOct$9lvV>qD4wYOmYx>UZq55ZLg_ zyFGJIAgr)6oRgSe{AT1kXzJfIj8NrJp?H}{0nSg4A$d}`v0bIN0w-&rdYTb0nWOhi zuPif`m>rTr9hxWZe`$l9UtBm%`wl5m`dJmUsEQ`TYL8-+)e!ei@ef8nrI{)xwl6YD z#I;V1saS9)h!U+#Ca+48{q183jt95ist^^+;k zWc@ZPpE-Ej{m;YyME~>LkLBOjf1%R-6@EMF@Be)Y((m{O{a4n{@|bd`VmV73 zGx{Ugf8Ia!U;iokuha2f_!K;qEbcH0*b|N(iFcYuqnzH$p?#8s-?FDdKkTh!;2U%& zoV&xn?LP!hb$|6@fAwGIK$Qp88ZuNj?Vz;dL;qj(JE*M?=nwr4kIrKk)QaO>*_)8! z9@29Gur*l;^1BzrO$arI4l14ddOwCUp3(`Tucwe#<{SS?g2qzrUM* zyua$-N5Q+bR!9@+uD&!X$zRfU)G|aXb$NhO6*?O8bgp?xfu;ZLwv5iR32~2RrPBjH zyt9zl_y>!ybBA29rYOjZE5S9JbLf&MJ@1f|u8J)Q0w0&KMjYWxe%rZk&{V4Il%rzR zx(iEgaw_-R-J)oe$HA_+uiS5LkwYDiy%@>d{k`)bIEdaj!RnYA5rTH}^?mDxAbJL0 z!ouOClG$Ln%dM}38yX3q2^{(a zs<0jSfqs#MKN@Z_+-YsF2TW>*xF#edgqQA<_x_#k`s%7qz!}stk@icu^+?{EIYV66 za1sNUE27fUMgo27`8E_LG2AcWZ&pW+O`QdMBe#Ef3!Ssn7u*(p0DnLLAP^7)2nK`z zP`aW}5QhQ60TF;mKolSv5CeDyhy^?c!~x;~34j-XL_iWC8IS@<1*8Ge0pR`TkK_Nc zU4O>^@2|k2w*uOUluzEI5Q4dQ7CCaIwAlO#VrSSF>J&NwJ)V`P-bTmTX@oY=&dh7R z=ug_NC&^M*`t)V551Q(L(b<;CxMk=&&;e~|c}0ykE#~Q_Helyt5P)BmOAgzqhxE$i za=rH`(M*@Rz_aJs6tNERX~f$37}KE>J#~S}@Fajkk#Iw-ie~2f(!D%EG39`{JzE3r zH?YfT&>daRPWyqKOGIs0u3nWU5B!6+Ng9p@_Nk-@cfJ~Pg`7U2B8J*J-@F%WDgdux z(h3>5ZeFO2j=<69mVLZ97O_%^^!jucSIAgFA*_@bGPP?hlogg9d%s$oeVWGm7 zkM5aL$AjYzWsV(PVwM`qV~JT4vI0I{y*{XVuHtI*oHNhNZs-YIE(H0A6Lk?wcVuQ~ zW(;M`&CLfRMkgmz(L3%?e~NiM8AL-QRZH}(XR}D3Thj4o87$%mF*I2V8AE1tZtY`H zsMbOeM50Z@5f3pWGAeR(d3Z`FUW-ar5yj+9hCmC07au4Y`K?Ij&=Ad()9@JXaP}O= z@rprCs30YiA&d|SZ0~@s;WkmiWA5%`xq=O@d$p)`{_h%n)DJ(yFZ)~avp*TEQ1_0n zmF?9(u|I6!Uw-@k4tc{B^}WdN*`JF#DEp%=+nq42LaRaA(a6_wO)p@vBlK+4O6E0< z)t!*14Fyl1Vzt{n{2ug*TQD<|U?>1gv9IKH+4_|G1p|Ry06&ieS1y;J6@SJ<8cDf3 zkELrrZsE_1xGdo&_)cPPP}>P7R=WgwNO&Nocy^YMnBi#M@GEWiM-neoJtS(n&ZU@HW`6=qRY_Usd|#730dv(amHdJ z_c>FaiNa`_R2KUTRrA%=_s}S#i(ZUh zh)29Ft^53FW>bNL($#_zulq5S(Nr8SnoFz4{bSgRbKzBK=EfBCxe_}3XHs9fakU2_ z>1VLB<8M{I3hC#ee9OeH*Vdp8XG0#lT3_4;=$WF=%!O9ZPQLn?50x$YI&r*Bjtg@v zzL;+63->;6%Te4^v%9zTJbdx>0q+rJsnEB+iy_g;U9eD>TL}Tr=dM^rwkZw9idkPD zeangKzCiSwS7S;7rLP|MFXnUKi#kp- zX=X7Dy2e_!$`~p|q&CMfPrtz|RV}WKv3^%H(f`2XZfEa{PP-h;eog2r)8w}wNZew= zR?_Ha&odTA2s#7lPn#VN=sYB+Mz#;c2h-9*B!;=}PEqv|( zU{R`9H>-$n9@=E$W@&y17ndoreN3Oxweh`RNS?J+!SXen+M(gJ`H_<(_rc6Vn}BBb za8dcz&9(`pch9m#yLkA_r;U7@eNCeD^gGpwTJ!nbyrzxb51lqENV+`o%Q&t&pc`s~ zRtoY``qPmpi*Z!NHLGN}xjzYhE3}v+QQ|t`V6t-}{CNRt;jD&n%Svs(&nn`4vOil-t_^@=4NHI$Xb zz$A`0J9&(&Z7bL7-W7^#sjk8z3?}m6$vv3Xc9Q8*={Pz402M=QVIKM8Ll@%0NMjIgFSB4jm z^h-Vr%n4ahgTDO! zo8RdZa^tXMn_(;b3ic?6k(Lz(!K37WGPzqS-?R5EOUCv@RAHF+3>Mw?2=B7rp(nm9t-P4KOGA+y~`Ym*}EtLTiZroKHJC; zhv7O)q&J%F9~@kvi<-`vsUv>v-@nu~^nPp0ZrX%{gX3JhL@Nnn-SCa7vSy9Ev}#!; ze_pjG`V}cL+Mo_uX&ay!-CF zxif#vTJzT1tY24EclFtO*REYu_c`NZ=|h04M-xfVY^#0>A+<0U!V%0w4h(1E2t) z0svD0gbsiKfC+#FfDM2HfD3>JfDb?bKnOqtKny?vKng$xKn_3wKnXwv@D6|)fChjT zfDV8jfC1n=z}s9C21;fC7Jv@`Yyj*48~~gETmakvJOI1^d;t6a0sw*lZ=WFql%oGu ze`|{Yb#VX*07(ET0BHaj09gPz0C|A7zW-km6_6wF=LW<=0^|UcE+B8f%m2LK05j%a z;{pFaxb1w7hGouV7!3K=?=7H!umKU{0vZ0JGzOx^3$)EZCP0lFI9dQL9uVt4BK^<) z|Ncl1tUzz`^li?*+41kM|M%MZ|7PsJ^z(vD0c{+>kq6Lh4(K!n<`gT?vH)y)n^FI< z0Q$jix$>_u_>X)2-_O3OZh4zzfc#7UoAx(dX22O!K=+$1+<*n9z$kD4{P*O||9|QJ z&-(wCSJ&Wwe&Sp4wuZmOL0A+xW04e~g0BQj00B?OYfl>=V8$bs@ z7eEg{AHV>>5Won)7~n0srT}ID<^UD|mH<`&)&MpDwg7ej_5cn5jsQ*o&Hyd|t^jTT z?f@PDo&a6|Z`tev;0y2xzz@J5AOPUa&bKxCE%p*`fd-`B!TG0ql^@mX{OdXhO;%Dy z5(EbS+gy2F0)`115()|m5*j!_Lqo&BBEi7|f{KU;kA#kjfq{;Sj*f{#go}wqfQ^oh zM~+88OiW5jiit}>ML|MEL_$jP_90;4R#+HV6gW5(5-fBqlK*LW?E<00f%3p0NH7Hm z0v!yA4u0)>`=0`a2CV(B1_NyfNGQNcICum^phF`XkgbrA5Pwh= zDQOv5RW)@DO)YI5Q!{f5ODk&|S2uSLPcLtukkHRz;SrHh35iL`DXD4c83lz!#U-U> zt9=e;zp-Enr zXOY8G5=(2*4-()))^8x&tcSePtjdK_hB?WIWyqT})!*VA)&9-1+f-%QjmOb-&4|EL z`vc+Vm?FgJz`(lrkeY?JCiag`7pPIkEIT@0tT|f4Z~5a@w1&wMVfbpv&-~5~{=h$F znl#wS?gY^nnoLZC)#fWJNF>%Q?BA3jB#aHqb{m;%qy%QMPr7(_i>!v*2NWzuZC0k! zO|_>wspE!dx<}L;khS9LGpcEHgqaT6GomdyHiY3e(?_Hg*gHUi&~mZ#927~7AkK#= z?|!=N$=f`*t0N`J-LzinWJy|x9&W5no0d;1XCok513DYw)*^-|kU5)TGC9`ZfiOCg zr+OJFwr+WO;ZPp3ocBent>WYn-frvt5;mW_W_}5*v8`Y9rE_iJ0PiZ41UbenH6aBR1EiJ2s3nuk0?^krb&Rv9IXFt zrm0QjOoL8Kl9;S?87)RjAvqZ4_rVKAco+9u){8%+@(!-1s-BA=McbLPG6IE8(3Vbrc0hVj|7%vRh zlLpK2G$ow}#Zz*!n=RK5BE#BH;D8jyKxufICY$;Ul2aJtDLL&bOCPX;=%PrC3Nphg z5m^j;M-fOD-(*qF=t-2f@keP15Np^+>>uf(y+$98c27#n?y8CwwqHD zgjrr5U#C7jbtR0MvYCOmn??{l4plK-G%Zpt=PZmcJ?T}na;9Lh8Hmr2VPqqN$}w&Q zp|E;GAw+D`!9%1B-R~-EP+6!vB8+)fQdbt@ESIYT!kbF0X34;=6UKq&AyT8i#?6D* zKE(02j=r9Bv4Z$G!lNeZMCUmURgk@yhpM;+EG!w;rt%ggr+KhA9Fx=b8 z#vu|UcnHKKorO_XqV#8QTxF3#vIM~|H#mpv!WfQsMT{R4Wl^jkBwQ64`^9ko{o>~zsM)aRCxdW$rj44puNhMO|w-D1@s zdDskCtRw=EhqaBsxHIu{X2Z(l9MDbTceo=(sK7P#HyR zjPo);qTYoZ+1997UGX~E86g}yKEl!x92b&@wwxd)s}=bXW*v~%Cj|Hr_VZ#LkczcP z32)H|NJ~}LM~!~I6n7{O%A>n%p6F&C~zLUNNLbVy4@mGX;?Htx_0kU zOa@6bwBoiMh4yZwvZ53+0>RtXA6Z6P{B4W-Rwsdbd(gsm z|N8dq4R%$L5(U+a5*+{yC`%CqU^89!74gX!c!>ZGlMxqD<57xHYnSa4#_C|#;Cczv zy2pMbrqKF}{}R+;RQlPdFt|FqDgrHnEI1`N3g_b&i4}cKQ8v`E?Cf8X+1lCLES?F8 zk34r6#;JRZpZim?iJbW$xdP?#HE{+UiQt=A#Rn!Q?73ZfxDe3Yuvui5??+#-C;Tx zIO@_CDK@f%TIBQE>5y=TV9Fm13%S}|U+K$)IsCyilO1Ab>H-&}W>nlOJ4vrurj%$d zQOH(}HzO3ZuV^iu%)vTSm}m$i>tE)7;PuyBVl9~0%Obu_qEme28-s}oAlFWc2)708 z^}nWt_a#l>^2>g#4`bN91R?~Ikx&$`5j6^atN%;>75}_{dmdd(?+TQ|Gd%x)#{VA^ zgySFaH$UBddoKBZi@&7oTl~EYPW)g$VXNQ1cBroYNWGgRgC`b6hC&lp{)mOxA&oBH ze_GSlHk;c6%ka*Nd~&ZQAz_#Fg{Z>uCyDOvm@0;FNY1+PB+|g>j zo;g9mHC8x5z=_${&+UnnOD_YGuzt!T$cD2GY z`3$Zxbo-+%Urk^b!@A1TBbavjSj@m!{-Erb&h_OXYCqgisK=Gb^fI^#`Si2;mgl;f zDN%}b@o&8!C@l_>{4_PB2i_YfQ5~(ga#R=AUL?0E?HoZd_w4=;AkW5+wBgElw8su+_&}O-`H@JdqF z=hO>#casHw-M@A2RE9v(hr!wPCGD$`=rJ8)ZQa$}dB;u2tCxFs zDT(p>-sPDACH1=}ius&b(2L{5#_OV;TStaKRV~v8h>L)5Lup8-4YdN9%JN=Q9TB-a z+s>!;A6X2Odg@I$!7huzPVDc$_*rY2)U0ntQ$pJrI)DBfTzg+kKjpzXn!78Cl}_y| zK*@05WTYV^v&+sBxA#L{7vb;|(jApdmLU$Mt)uvGZ~Tu^J`0rKR7f!EL$7%^&e}0T zQ~mq8AOdh=1ldlSjtxXf6essA9%;F3HmxHv_|*(}#b~VI z9-D>w>P2%S)W$z~1~z-fmaTjSynR#6F;&lzenKj1ln?69DA~wU_0+ z4O04Sotks~gNF793V-NKjFCdGi5}d3a`zLh*FJws6~PSCMEcs^UVSDwo8 zB{2sKe(*3)Pqh~`+K%2oBgjSja|Xj6;xmTWO}0J&5@5!E-~tdqSR|< zu~bdbqWFp0jgNR$NfhEESjuxfhkc}NZF(*+0?G(B=&bW~z$-_F-V{U>mxY)-1=pZc zEWlpRk|RB_^6HXCUz9@vON5UL=mFMxK00n@rS

      zdw+gczzYQ)iDbnxuB9o37;?+EgIT;H@q|5cIQ{>YoZm*`+HemHoclr;A8j#rB6cQ> zNB8T`>-r*_Wa1`8?EQh*ER!>CliPt&K(j~|T@)juS`MR={$fS0BvUo-SX z!V-vQWs(^}ewC~sbz}Z`$KJIRRtP!8_cm(&rhO|(2MJPbqI2pJOqj*u4>Q}SQ8Au_ zB~-PJDA>|_bmsnpmzHt0F5VHXMuj%Y)+;6bYGg&yXUB)L)Y?9zYkqM}ODM;v$i=Md zeBAQXB8RfY)QNKLC3|~Ip%V5OlT!ygy#$0!ZX?Qbr0NnroOn&EdY$}Fo`3;sCni+N(`B`jN%5vW@G8Z-cvBWu> zih6uL^*@|1U)BneQ1}GQShGjbQ_qaw+pq+hw$ApE-iCR8<<<3_uD-nBM>#6wK4Ja( zm9WTQZkR@hXtKXl_f~i8gs&hsA`lXtDV^91hKJ@^(iF~sU*7l20K&j|f0%v#BZ92< zy;&E@x57Fe7W+8xkkil;MOdwcLSu7t9dzN*Qb8v9yK-7M2Z=7hVpF!j?+i17 z(h0+fk+3%_w)F8O10r|Z62p~stR?g8)v{lL}n zBe3L<{x%+DJ}g9uxRZVU6TF!zCN;n6FSxM9B#}Y!{v%w>dU_-NMlv=wmtN1oiN5o5 z+eK*}y8IAB)2ZQwsuzA%76*xrV?xEPAJ5UcZW44=IXJ79X^g4q($_OSr&d1a@g#QK z^_R0tPx{LAH#!{UP24eNZPEuaqNWSx1ayolX;X?8`Vqfj_fz~s?FRjz^TML?F^Lr z8cyuxDZ8{@N;X;oYH0i05NqR@{>L`2hNSNOL5aT9ldjF(N@b!Y#E-7*15abtFLHK% z13~L;R;ExQHcWr~P}Qcpg=c9zNa3r#`H`Y`D!Ft9vo=ebem(oJzP6n7SF)X^Bhi-u zC+~CrU;B0xC>+j4V&7^gA;_WZuvSBm$X=LRJK>=r{eb!JU{Vm%3OMvPmfm7;q!8Xh z({Qn^2T{fRgm6H-xDph>!S&`Gk~<{|BZiOxejD)|TsT}Ekx7X!yi7T=bASKh3af)Z zY~x2ArqgFTdn*z3&iKipZZQfkQ8m#;pJI(9XH9lc*>A(`tOkpGPsb&TOR+3OCI9lj z+js5J$&gce&ng)Axp^^Ey&MN1_H8P>fvRAWy4B(+o-`!?Kb!qb&F9o!#X|HLLd=gv z&P#K;(PtER!n_Zjc*3e_0mLw9Sn@Wh!)Je(z8gHg(D<3YuDUcc*(agqArpV_5&eP2 zG2)^etoVYNMjQ6Nmnw)0dJW`KML(7@vh(wT^@(?QL)tsAzONN;U~ zHE)JGF^n=X^m+;hw8Q7lK=A=%UMY@^A4DE&;>+9^p`1}U{cEY5*pb(CI2x@GP z%|Q@``$^_L6eEyEDe&Gh=s=%}%C@wxT96FF>*s-4p5N?}a#fn-!xy(c-e!%ZwxGa9 zs0iX$ML7DCwHAM z%lfpeC}ZxImsMbJ9Mcy1Oa6^Ln9_9nd8RnIqjOyVIGE&V!smy-?c z6!>#!a#p-qe(-ZjbQH+(@6?P|@Axj#$Z0lPGbur^XHGLoV z?YjOlz8ab`l7z)^GG4zW=6w9><45P-6Ie1#f|k(2c=&6fd7mnJRtU-!)+A`l31+)K zqW5(v_O#kGQ+N1@(88U`J1*#)-$>;H38k+CFQT?SnG-JBvj|H){!rdSPdei4gD;QA z=r!G9mrh9X6u-}C*xsXJLu%mtIY)`^=Z>}(SgF;yO4DHl;ayk}z3}r#$@5KL&MEe= z;jnRB@MwAlVC3jeBoJpU*zw$*;ybTCY4R8ii-G( z08>RSj}@mov(P(~$scayC`7+l_Z$}OpZ)ww{?5g;SMA+dr03?W=o5k=d~k?piaCq~ z)s*d4p{e7xT;;f_27ayF5wRM)vQGIpEEybS7r5BsUqHisK_g1yOmL~#UD{702zGXe zcLtS6@ly!jq+=ojLQ8XV8~@SZ9|toEAhkLX;nf7pBt`GQo{2ldG@@+@Fbu>Aff zk;WNPpZFZ)!RszOj73)tO>&F~Lkk*QE1utIn8VG`YR3-OxQ|C(ZR!(r-~G^|n*k{t)V?0;(P~iDaFxJ@{LPn1zMUy4mK)K!UiV7xoso@vQr$kg1 z;xq~hoby)RE9EXl1nb{Hd#C+8rDC7FrFX)onZw|IAlibTQccu zh`tz}@mLAexp$7(h5qTkA7`II>|j;7L(s1pW59a6H9wN*HW?TdQWb2LVE4a@G-0(o z@$eI*>ZqniC0yq#RA+zTt_rZaGT16gPpDMaj11KQu1 zi}`pd-+d(hdP*)*RQxOQ_tE{MPL?XA()h7NODQr1pJgz=M^I0^xD74$H1YlO-M*Ed ze_h>jkhBU$Voab5X_12xnMgeWjcFvAxUS#8*@b(J=8BSa@%n6%%J0$rZ3TGQ7tM<< zb+UWN4Dy&|f1bFQ53UKD$w&>(IL+I8X+60jxg=!+%=SVyr|tt&{g&IGv5E!Z_UIQ( zq&5?;qkBXx2B^|@n6wr8&h`pdG@{JAaC>O-I!vPud}v!+IWVq#3GADC_w3VQA#?X| zk6P(Qk~)kG%(&zyArJpv$Q&N_h*I`guCh2#(Nu76p>zcn3T}CsrfusDxomo4Woxfv&=-Xa1yKWCwnp;S9yWxd@7V@eF>)h#5|l&h}Z86{aNAc zD;&Hfa^nv_Hlbs8xw}CxuZdAH>c6r?$XymtTQKa7(bQ{*?(L{XYCky{uBH9+74Ab@ zVx{4i+wzDP=tOJF6kMaxKpo`lxfJJ16KMV zA??$_sH|lg2u<*UX{Y}=(@U)o!=?EE`u8^CVSDwOjqO*v|J=Npt{?zFcEpL&K1KX$SduF0T{!TpDVW? zmZTbCy82kV$Vg3@AoC2=%*%;nn6Tu|WD`hC3Br$H8j>CvaPNJl@x($ z9oD(=4~yYO8P?uA$1lvCs2?5LLO#K8O?L7AT7|$oiM_wk&8t577SD4Mi(kr1EGC$-9J5I{r$9Snp-^+Pp>Cct?}8S0LD%(n?;8#PQ}C%MGXeJxWi`f0cBN3qM!0V-#|G06Pnc2#}- zGz!hM8esztOtQi959~=|jqoE4Cbj2u%==q5Vo7K#qn=w`9(20658C?o7I)a;>7*ZF!d zX>f?FtQ{<6_Via%8#GlHDss*}ah|OGuxh?XJ^7z`xgP$fGOmNWegmuz_C{^X)w=vQ z`k#~#KKIYzhmYWT60r@vVjgHaMh_jDf+#vD<%q@=9*HvKzC2-E$$rYXV4bvDUvP%Y zrmzEDg8hrgVd5e5U~-C`;O`MjK69d^-z%gPCka3U1v=&MOJl{GX)|F4tYNs7finb+x}80-B;i1`~8vW z`q}XQ*?Vfe-dy5S^sh6q%R`2+rT0Nz_`h1kt81p(^fo>^Dvjfi!1-0dTmkV>2 zP^F|p7R9PelMlYjNWX-B2u=p)-tU%VG7F=`ijxu{qV*dn>}?$};s#7OSOBWt44;zP&&xnx~G4Fm713rW_|=<*8jA>NAl z%EBSW&^Y6hu13wpbkqB-{h|70)OIXqa6-^-%~~<@2xEgMlm6#1jA1}DVG#sJtuv)dBCxO5bs!NsI&`!`um|0> ziFo1N6tg1Qry7Bwh2n}V4>OmAiAEQ$A&z89kriTu*13;H$gVB(*}*T2^N;A{MDm{7 z+-cAnjpWpQulSSjvOBN$ZYr5Sg;NhFjld31lcM&e=2yH{(ysoP+KsgjX|^K+XJ+5& zjjBZBLs97(&~%(;RCL%B(_nYpL_-)MyOSmyTRNd~-?1{4R}PMRdnZ#xe>~~ISS;n! z_;K+8a&xds;NrZZ`au9qXakECDLh_+nkAc_44$OGk(=MmGIJ5nHItMr8q-xH{52>$ zsebnpW~izT2jy<;1xePOyOYdEXkA3UhU}en2j1%?yDZmEc%~OOcc)*LwxV)4RWq7F z_cBImXINDPo<(#9f~#dnfi)WG5)N+r1EjZp#+u&nELCu!abd1h{=u)IW3gWy^*&Rg z@~WkMwn}Z;otYq$3=O?Sban{IC9_e9E7F?l7T4}WvTZew8WX9?W=$!-=Faxl0RPhR zYdD!%5FF>-DBUNiHf-Rj*Y&slLEeY^Ej|FDXN< zVx0D53X`jtE<|W0um_t8gzY(sVN5&828!Oh_;i#G=Qf!gP`AzfG~85w36yNN-iIL! za?T*U3l9)}p!dE*PW|#~e678Ri$)M4q9w88fBW+F(Qc;GBPS5^%yW@V{HYnmPw~=+-edcWri{2DWUFq_KnQ`6Q2U9YLP4$qKqeFd+gUgY!Pt%GW zNP)+8Wn-jbmG^M^jfI(lB(fSwTzPkOEgzsJJyDnu<3epF(G#FIDdX+6YHz4Osbj&F$KoS=o7yl($GbQv*6a6~MSXAR1<&m(hTZpd$Oi%wR@^5n+M zzNdiAJb(0W_<~Gm(uj-~sh`h=-NbIq$TjtVbV&YJB2Oi9M>>d%?gzf?+*Z_%jrEyL z$Xp9u;Qr$56bu|U#9ePqNX7d!u+WTpHXo~%K@6!d0j+?`#%&0;w_a0NFBN6|`v>dq zN-cC286~S(r{P7`mp+_q7@|H$^Q<__{t=zX*hyJ|1VvUtqNBCsKj#~m8&G0}V95{s z!y^dlGYO%4zCX(wwoMo|csHLAI-@N^oI-uY`d&cEd%PX5r{VD<4%!LEIc(o`9sh9M zK);d6C*lBdNxWtEVd1%ZbjWGMiMtrQwvOGGIEkfnc#Y9nYktx2NNpz@3`iH#%KATC#&GB7 z(_0}JZ2~;Rxv={6bH#`C9|y3K!TZK9AFj9M$gHJ$7=7@k)kFL4DWsj{)8cYz0x?75 z;O~AOMDlhP^`(wu!5xS5MO%7?jGG-#@-ScG*NT`?EY?5zuhj{6kk=L6=BJ;B>V3I? zk6LWFD^Q@@G)3S%7RpaCw920qTR!A!cc|C#y>yqKreAaM{z2$PwHIewrGm!~DdT z09n5W2X?J*bJYHW7x?AY6418U0wA=mFY{q=miV1;tENTHE-q#AMOxgO8-^Qa8%8jD z>t~Es7c61-KZC~+ zE8}__E-zs^?Snj=z}B4izNot#%^#pnm-aY7SxYfrqK`4tvIV$}7I|rknj1iO;+U?6*D0kw zch5BwBjYaJrG_Go5A+06WK*Da-lwt5PknbK+`-`~J*7HBpg$*jPHXPdn8_J2Ev{dr zI3l^YRXJ{@NlUz2j?XI<=lKZpyIX!n#IjxLZoiA)!;z-c!{*z=GUMYY#XY`ifICQi!jjriX5rs$&6JON~sN2JBD$wbcivYQ9Ae6%95OQ zb>dFD5lNO(c~eVH(z5)bGwo7=H&5scmW(bX>iV|K#lvK752?Eyoj15JHjJE$bd-x^ z%#K@grW`NGAL zT2(6aoCl!w)ch0mxS|<&J`n~M2#3Ykbz|LS_->z>fJ0$c0WDD3Xz+^l!?NE#ckNHS zvMyD!o6Ge(^0Air2|g}xh8%zNGnq#P#^#K#FhwHa)h8bPAv#qVuLL)YLqGZqg6K}2 z`B9P4TU7x(q_Q9M#5{pNufTlw??4{KUZ+1-!bNW(e!q0h-KW88 z6-Z{?P$0IQ6^^Jh!pbj-j49?s9%Kug&3MWt+%w>HF?gk{mxF@B@C?RmIZw~_{TnSS zYqiMWwmn`7=GXwbvja7#92q$_CdEbym(hisB=TR{ew()9mAy*@1y;Iyv2eI$Rz ziV_yDC{~!vIK(fMc4GhYu3jYWu=fXvw{$%o7so6^nD4Slk}hW9!PFi$rKz7usGm@5)~s;$*a@~Nu`+i7g4ui^P5nTw_VP>*lFZ0 z>~@W@esdds0-5j~6g${+M|Fjmv`9Z;KEsgomi)rbB`rQiQ4@*vKqYXjzu6D< z-F2}>SapAR%a!`L8a1n69a{+k;9L9I+Jc4huF)U`(Y>3)GGuoy=yL1}S_4zLbI5Je zyhk%*is}?&0|9tfrT$jTJwxY1vKPU5^(*dcUnJ)RbvCive0u|Np*Bx9cU3GA!c>3Q zqF@?>Hth1=Bt&CUtS#KO2ZWjtseo~&`P`z~M`ml{hUp=kx|u{#O{ zoXxUUV;EVIrE71)vr$H4wcVlRsFfki>jCxD$PtbL%44*|O?Qjr5;FA9y{m-(gZ8SWOWVI! zwYGoNslPMN%sn3ATAO!W_Hk2c`iqwBi>f`vZ5}pc=Q8c4t1h%7qWPgKVA-7H$;EWv zw&;Cg$e4BbKyhiQEH{LMlLLEz#!v8`Td_W>VZTsg&+qL#>8k;8Mv+DAMc5++ZzPmL zd#C6b+)8%vJJ7z(ZX!~kk(lE9;`idFwvN112T2e^FdQF;dRa43MT@A zIpwF`WVbf#lmxZoEUh^4!GAuEM)=8a*{(d^zu*2H!gGAwcIySh`}l)*lhThhXo<{E znmBAujVgf<9Lauy^v##LMn5_`aqgIJ-*C1*k#GXhLOrc}cAn!J3!}3p0h!gxS7Tp! z?Dq8PbB`v-3)R@6fplH5%O~O8F9R!_CRtSQD=VU{r>nXUM1js{s_5`_^#D>NBM}+e zdyA|;V))*F;!*MuZlsCfGl}O$jT{WM;!zdR9;;}6}<`!VHIVT~`Vc zt>g#jSE1p|c@E-B%)9N+`!*ji%rquA%?twIP10=%CRH974>M#!sfco}AC%CT3*c$l z)qf?2OLnAwVVeG6ez@__z8`=rtLTUDhLF{qWOmMYexd4QpSHMqq@FUjXc^AZ0aLmkY{n=9N=FOi-%&St? zrM`c(#&F7UnXbj$qoBB$(_&sjw%@F*WD>!cXRdTtI(HsW&fb~hif!E&FVpESH|kKP zE)Js+{BC4zmLqzyO%lE!9yY6}4Ou3N5l&_w`IQ}NuOCRJh9N=LV zG1R5C1jQ9?7s+p2octahW)81@MBj(H@T!|sD;7Fgz|2dM_Bpi`NOicQ* zDzz!iTju9%`a)s>{ax-A5@+4BjM(L>CM5rxkLL^@`O_VOQ9^OrV&QzL6K}*(i%rX1 z`1X1Kcqr|y&;-f|{DC`K3$cwrrFvzWk^F?*e8MNXovXsOCCv0eSvrH2ePjN2pJ6lg zpt3$6o99FCaj3DD>2ez;RAjo2vxp`(!6biv3FB()w1O;1HQ)dB6G{%ATdF!j1`p9g zpA9?q4=33vw~#L82bIreji%%A81olue?lf_exB%F92ui@y{CjRNk=);a$-{$@iQ&n}F)ggIB z^buM1>9}sjHl$sa{t9e&V8|&+tee{@;nz(-e!X}Eo96Gn9_oE}x8xR8A`xbA6v|kM zFMOwH!@Q8N7@9PGnENs3%bom87+5CuSODXtc%v8wK2#orX6)c+O0=9G@>rAu?O@1>^vCc(X$*9XN@e>FzqT?W`EDPv4rgzV2cl^|zc(Lz3OJ zP3YU9*GF(bW`!2o{E+lMX{s}5ZC)~u5nFk6ZV_G@>s8Lz{M5mDjm7qqRo$WJ^Su|8 z#Y7ag+i)<W7CWB(StFz+%}IDkvi!jxlkY@reP>jyEGOCv-VD>-lqsc zhm~kR{jGQ&ygq9p<;adP5x;IC*6)w7xg(UJY0P$<)(k;1Iz&6cC_Cn!aOfZLt+r(U zx=)q1-k`eJ6rs7ed2rl=w$^ErovpTaeCDa*UG7Kl6%un*Xk_O13ENVzabF8IJl%u* zMR+wtS{)zJAvFb3>!8cYw7Cu<%{4*!f?Dq$2jsm{>1;sv{e=g>2RtPANWYofzMJFd@74>rC6A(nqo~jlH>n@`bDbcoj>3+tNJkk< zf?eh+ABwn$H$9ESOx>QKVl~9C$hA~($g&k(lzMge zh#AGJ2&oWz6qSlm#qUCpS0;9z&NqdQ$A-E#fTR|A{hpT1of{y+Ys-|P^2TLM^M6Lx z62S;RtFD#yco7h0vIk@|Pc@rP@#BBtfN5i%be1~di%zb=Omu5tA>eP6KzmhlG^e6Z+ce}>MR$ww^0B|q$gDUD+;dzhXk*LQdCIb| zR#iVfXF@z#?TQp7P8tiuzLLA3C|GyW-HB&VE3SDI6-E8!L1K5Q8oiN*HQ*@0`V~q% z&o{<%&=pTN;hvRTst{Q6e#7xBXL0pxvF>IFDoHx?UQO^8C4?M~UnlhHuUv6wy-mCh zNJc9mE!OV@EyL7>XSgcgJByxc`ZRYy_$ta1uep#@$zH|&f@H2Hta`+t_H7mwv$CNBUzpMkJkrN zM^yOFwmvlrhea}!lM_P4y*ZPt-j`-`oV0A7vZ$OFyOlKriPL?$uK{h03BtCeoi79# zrksi7^M)P^=I*y2p7e~6NCf5u-O4&r; z^4~9K=^WPA3s$L$k6q&aX`GI~sQ1noz7Z`!e8#H7OMvC1%pEwZ+#5E$Y&PV>+55{- zgQwto6Yy0*=Fi@U?xkXq2QQumDt_dQD-Kg}Fk0s!t4SXmV>bMgd^2614=ZUr zSbFlq10&kOkDA$*)Jh~%B;@UXD3*j5nmb%~-#r=Pzbcdf=kf%>jEXnSE^195C!X{f1k1?#_@PdtX<}tf!7ex6{N*YN+ zGw!dt@Se*_T6YY=Yl}ul+G+ClXP>gg=f^SW3k7gC>5v&E`O@ETOrGbf}iS5=hepbKEwi=)#X?HkT0T z&5dR~-ftyi3&T{be7(yKC3~VT&UJOt&WS~8UdrU;H#0(ccg^3ZWLfR({J{9zi#LYz z(!Z^gfNLMMQeSUPG!lW-fK9aV_;3F>luagM)1k%!N&REXW)%9KxV9mh;D$1yWAGc&{tam>uj%oH;-Gc&}@G2=VVz5iQ1Z~FH1>z*~M`_289wvLWe z(xmCDT?8AlvMp{yGM4s+MHsI#oEla`*)9db>*o?vcbYNKwiQPIGJBAiq| z-8>0G$wDPi?sA2R5Z0E4QhjlC4&~OsFjoDe;$bcp&e;bF%>vp@sCqgci^SquP2}u@{ z{QQ_*0*#UO)wC?OCg!QLTpwKs;})q|rR2(N9n_ZyXXM+hAEiwR5m|C~8N856VZ z?qI#C_1zxJh@uu@saA#&Oe>pFm!LcJQM0^S>CQh13mv{b%Wl$8(4%L&FZ4x466ZI$ zPb+HGw_-Ma;3e$D?0o8)T_fFS~%yhpOU+zK&gAQZ*HKHSYOX3)l`m;@fY+kJQF=#0>p+ zT(jTOPwnHyjAf|^Kp24WGW5=~RDv7V@jZbP}Dy(j*D2o#r73oN!L&UPMgEjvR$1hOtRWG!gT z$3oG9xZIShOCNp5o-;~`%LA_CTr&-@s9!|I?WbL8w;1Syta*mJep##Y21IouSvAJK zT!@`_X1W9j9OKU_0{6UtA6q@QE2-UjR#cq5x`iDud18IH1wRLw-4~~D|4*#s3z^1giPm`kEz-yNZ}G9K-= zC(I=29O~fOuIsaI8y;N>C)<{CI004mZWGkN>b0=pM*L$^(MMqADnbc*Z-U#s8t?$B zQs!H=MEx}&X6qBWn!p@Us8&R{ba_={Fp<|6eN%XOt}sRcImdhT-f${3c-+}Mbw~sP zU33t&d_~ohoZV+uweP}T%~^y+K}dD?!Gc?|CM+~^vqB70MA^EYh&##T>Z%}aLQM$2 zbk#*iiPxaS*z{@!!m1he1WpGe_ghRF#-JM)*oAI{J~(ybT1)V+M(Ul)fmM?%k<+T6 zOvw@IiKVMXrfBng*bKpSb=D3w+=wN54ZU0~S5p%rcSVpb8O?*zYpKp-HMkr4>Moc!IG=_45B}g{z191ZJ1R0OyU(M9ULL>o3Rj{3-vKX&u%GTcHcS zXmph-F^7k0gqR+D@|1%Tv{05*!8|zJ_Rg0$GkEQxx~6Q4C(4-n(F4ZsfV-8#XLAvc zf}+Gy?DV2$HNodeYjV5rJ0s-eDqZJJMGc;Upg}~M{}@2GVg*}_Dhp*LM~J8-7To-U z_IV$p=}*_QRdTK-qiM`diLUBL1)eKYAOGDX5J+3B?kzG%_SoZPCLLtpP|oqz`=#2YwJPK?Iw?JmJw0q1FMepkWn}n9^6{I^*()lV*kc156k#z zwGoMP3eIHWb#?t^VNsw2FJsA{x3q_07SU@Wjn8`sl8ATCBJ+m}47@N%Bu9|GVb9Ku zlph^DI66qNGqPkAAe3|A7vco}&^7#^MNyISk!8%s894kSKG`^X(EdznwM7|G@^;Ra z+5K8e;}SFST@F7_YNMZ~M(uG?j{4-!7{~k`7?Wgs{Kv~7^(12P*2B-zwqCPxrq4u& z6t1HVx@?)y#?pdE?mGL_twE5lXw~4y=z&h=h~J&Zw5nW5{gr<2dsoLi_Nh7y z=821mbs_6!GGC&V2g+M}f!?Q6I$)ejeP8O+#T3^kt)LrVR_jb9aCLz_k_-w+Vp=z% zlI`gFWU;>K+a5N2x~NDcr1=q@N3;MhiQRU`-hi{JVYU9 z<|nn#V=OozS3?Vep0+Is%WERz#TyiopLsW+hD%c`zogo3>IMzMNXGzSjf$|T+P%_C zC(BC^c^Pk=`((Jkv3OUVsQufme3&=>-U`hw3S&`eGz3h0@*e2t&VEi5z?paG@rrND z;w6o&iXZ+D<=c>zl@l;zSBN8Pc&LhG(+1twXL^^-=JNalO_3$~Xt=jImG2)Mc(tC% z%?Bq!bnr7`x&?a%H-W3 z@ggkgrk&An0Ll`Y8;7^?l?xsiaHyy??3-v29PLo@EtEx62ou(^YmaisE^q)V_O;_% zrH|nj^X7D%T18g!3zMY8K0|E@RvTh5VSOJ6mS8jO?@fmr?M|}_a(?jpdx-;*OO6+9 zP=}+XKJ+WKukX-#m&#=F3gumaV*Y?j3!5$F2Mn5uMMZ$Jf>|xHxa!({`sq6Ap0Rj! zZo4C2=UiY(<;(Q|N+KRHL zBJ_D{5CmKwpTp@?u8Jg4Rxk0{VVl(r6|1oqGKM*NJSHYCqDvQa zeRo6|%zZigM48(1cSErMO6=}*{&*V%#DF>}o`Hm1jnWiYw+lCRNejNh!lgVaAg9RU z(dV?#4|!L%8vVt5h-t+acL7c`?2@~zpRcM&gK_?rcquHm`r(Co`SoSxSoG7$xEosO zd5=DQp92Eu%dl83rS2z2=?sEoR-;E7LAczstktO-TM$vM*8FK zz-}B;thT0$2vGp-NJlPu6b5R0CtrFh#XsxVfu!6`U^+wr0XaB{EW6MZ@ zp7+pa0Y5zm6|#Iv3ZYXfjiVV2mQAu&l7lem86!!K+b2RrPHjaJ<#z!Y#AiXzZ|JxE z`i)QYeP71=T0mTKWMSG!KH{4S(qr_&QDI{!dWgVYEft7NTKq)H&D|N5HHJ$B(l#iL z&VS3CMDy1tXz6EHxQCLXBti62)q#shuBvBbtb2#>hRPaYGc|T zM?65#dGiJOdRo5h7i{P^?L<{wNU!4v&QV{}ZZ2BvfS>xC8qFIqvn1cc-h9}+zEd-R zTC_iZ^;+UnFX&y5w2J`aULR23>tS&NUjVfYnsO(Xv&D=F{;fDo1n8*m#AYH@V#t3o z@qP>#o1~TjQ9pM?CaQywH(ILYal78A=5j#m%3>a#=RtyiL1adM`053(Om_uaT2 z_>r;%qcO*ahfr5$n&Fn{(@1t<4M(JqGF|Hf-0x)3%s6_2Zj?p$C;`Q~d$VEXV8WzZ z77u94x%GU(Plq?@=VQsWCxEo?6S^N`K~ftoK0gY|P80I;H4)t`6(Ko%=ud}B-vl{Oi@tp zSd?Qgow|r#>fc>nV-Vnr7F~i!p4i)xFP(rh9&uf=FaS?ooRdRRQNDsdx>R4vu-fEM zI>KKx#)z#E112_}735bEV12&&&4`H9z*R-dWq&@=lnDcdZxY5p4#LC6V6{9LewhGr z@5F4axn5g71}+#YuEj+sLx@RV-W2JZB8(U@wiMicQhv#R4=z@Q zL5zL4_)I|rT2*9dxDxWlr;!5IY(q4xT03b}6ciQ`Y#7G&=?SqCmi#qfqf;V3#b$w2 z>Z&!n4L*E`Wu=PsnKR{XEUdVdBsO17YW`!@x)YiVmH$L(65UHdOeCv6oz|O&SncTO zY7!_Jo4-JQ_v!q~SY}7s$yp{sZYgmcXtz>CE(tNQKo^!7JOaUjBvwie?b#)f8^^$b zk~!*doEmBMq7AX$@rx;v3^rd06wB|dZ~Nuw~J3I=-6xakEF5utS?q02%K*YWa~@Uhf2}N1BkxK#w=_V3d-p? z7FF5D&Ob9qCIo_P8~r6^1L?u0f6~yg^M)mu-Ag<^(eX%_jb=x|?j3#(xuE7m@n(~I z(Fw$j36}kmfgrqi>6}t3#ZrBh+bL*h`H3QP)O%Op`d3Vxqv;oXo^_^+^ZtO&4ks?# zN^MW4A}8qB!&vv*lZ4e;kp-3tQSuaxhsW9p%(v~j{`p2f8E~oZ{LNX zfKsA=>|YP{e_i{o9X0YUItsME{J(pD*S=*3dNTle<^cZF1M2>=0ndQxk4oy_!vC-H zcmMCoME^Vf-!)@F-i42V_LqMqphvbpdb_N^GkDh^W(NK;{y87Ee_MYT^+xny3`|tJtu4Vm~ z|G)H~YX6=eF*bwkd5x)x|3Lo<>5u*soC3uK#2zc&gDBG0TAbGu^V$ zz$r^>GK3BpmC_45$AA0#*WgLw@2+qMSCALrmI1C1REMU~6C-Urz~T&2C8{BMm=6BhK47QDp#8rRn7_NOakSpiSx4fDqg_T*sRVPo)A|qM2j7w z&0gFtxT{|a(o^<7I`nWZz9J&rz9D0v1$pDnCkCi`csGAu);U>~h~cL>yvHN$gbqUl z>DYMt+XIbiPe+SH}4hFgz@ zJil79aQAaQ)~crLt6(t9!Zrfnm~_O?i?P@Vk}2Wz4qBH_R5WF(35>lkwrF0d#93U{20icY#^ha*dW5Xme8)C_io{ui8z(uzk0J z-(q>}j_2m!L`HKaMS*%snH*`8%vh4rlh5jcOt5ah5?uzIuIE()$qLZ} ztRo0)=W4TLYo&aNnaOIGDzI9{CqePf*98?5TJx`zUy3$#BgeY>g#@kK>ucZNQZUKz)I>M%#gsI%p8GcfGP}7aL*jN!shu%n~xQ>X|du z;;#UUu|?=~#JO$zJF&fvQ%ZTiw^`^x4SxsusDi`- zxhrW0{`2fQ*#({#-b~IVSvTjTZ}TS(*2$wTvVyifgA?Pk&6inb>9F-fKARZ34|t#K zLb~GjLKP#F9H=O(wo5E<%KLMw)y*c8?i^)Zi?3G>>w3s=!oWtUuVRPLi@Wk&I`qc# zG{me{=jK{vSU#Y9u|hLukWp_aHpgsmrlB)b{iQdv-gJ)O87tS30C)UL{$Z&F3$iJ7 ziY_qNs4nLGPN30=RePK%kwiTwSE-wKT1ME3!Hl_&IOS^Jo}D`*o{?>V26(TW5ZsTc zG(>zWgTGvDh~t1?LOfwNG1=Kav85V3VIkp(cMK^V_GX`3 zUh_zKPc?}?Vc2#gWNljhmR2Gt^sB%DA}yh8)fL^cTJ*Qw>oT4?l2bah=AOAY&fMxX zvkaz7wt^$|-JaOaJ~zbh@^y_R6S;Uz->9WyO{Mv08`~>QQ@62%!MHa-ne`hWz~Sd( z{>#`=Pq8!;B#HqZ+VOQ+LAIKEifSXL-2IAG`jLlBFe^22Q-f)i!rho1!RO20M{Y|J z2wFMya-C4vW!@P4gm)^aD=VX&@#~ALv|(DLf=!JPoUCT-m=EI{iH9ji*+23!c_Kav zQ&jdi*)(4BkZy<1r`!Ha_<1$j3hB&Ms~wns{}Vw7joymb0?c_;5T~V+2*CwV?AF&Fg{tjg8dWj|8u4d>5ISMah z?bTV`Lx;nm-^Pu@trbTqp3%nym@|12-&n209UF~)EwbrcRXEdq86W7q($+dQ#&xj_ zn$?Z$ZcP-QcUnC2scvaRT=OL(EUGB>VBE&nttfZAJ*Ffi#Y2lUKaR)hml_vAr{ol( z5>e=w_gX7sHpl#&-zc-%jPJlGRXGMb!LDy)AiQq(#p3F9hmuiQC##-F` z5NPu#3|hc46R-H%ra$yuT4X(siy3n`~JW5*9jx4KB{c7C*!gyt^;*=4vn znRV(JZF-m$Pd3{9V#EOaJOkF0Dl4h@mlphHN$3l$g z&2_QWcDn^cN6RIU2D#DFAp9%oap7~$jK|9J_>exy4uMo=_8~9T#d$E@wS`5hM9?|h z4qMU)sChz1;r+2l*a7I$~mmE7uaKG;&jcH)Z}!QwUZ4)axzaEBIzMg1xdvmHLn z`>+R>pAGiHX(ePL=-H#E*enaSMO%=+&}UAYjIK>CAzB+8v};#|c~t{P8r_w-KTEyr zW&Lz+K>H@zNZZ0CS`{}(FsBm*s!?=>@M8y#@nt^vd)y~h1?7$yjT2o69-LakdnXtCum)Rm`1#(~BgUcIvCsWI zeVEi1PHcgo{gnv`!VrP8D&D!~>Yi=seOt-9slyzWeoX^+78B{_aYkpucRZqchboaB z=;c=&p7dgulz|`R_l_1>ES>X`#(8K>Bvagr4C@yt6GS)m;5ul5Wof$klU&9gf`bl2 zkFCaVfJ&NkiF$pinHzKqj&FoWQVu2=CPBeZk7?(Oll?FQ3^$jW-;|f+KcX#)$d>8W zx|_U{p-Z~&L}qQ&@s;;9%us9*nNtc2r6795FqX@w42Pv-;`gWXsxB!44GP69ctaYH zI&7BV&g`zszvZLXS@v}^*(ip5O!=Y{G`#vC)R>7?F(5v9?bzF(T<)QRE9<%Quz<3y zB_b0s$`iOua3nH5a8Rneb@`**C_k?O$GwjLDxTCX_Qd>1SV=$4k-3muSW0~2lB-Rl z7sa%h?l#_G>o#J>=4@H$Augr!0x5v5RmJ9ZrSxuQN8~{@v+cTU>1NEN7jypfmUAyd znMQ6ZiRp3PU1*z&m2tEI$50|Y57fK|unpjc(-4byE9}}^? z?KB$)82}oCMzN?~UaB-^O9SPDG&PqqN2rwG*OmaIC~fW~FbA=Y3+&Pl8JGw#v*Qgm z_{COz{JkL^())*+D`uy>WzC-o?VHUtL=9HpzX2lhGQHgvn<7PL>XOyzgw^)zJum3S zp-Hpx>=B&A&A5cl?1V$juT-irlkKv#)&y*L^NV{A8P;s8k&;E^GIClbucHp}-W!S^CWxKEbXq1X^N1Q6D?pEGYvDhuAr z2w3!n zSKn1WsI1-z&v{sb!Ghn+jB}su&){ zAZ?phjvpzXtgO1G8cgDa&ln|8K{C-P=D7`qy5<=(J7~Lmd+fVjOV~ftMHo|2;RZ4^ zW-_p?rH&v3^9pm*AP%nYJ zi$a>WK46Csf}+qJ*8KM8Z8Z@SZc<2=-ZOvny$bo3H@a)3{JeJ!%dt(vI6&Wk)Rf@F z7AoI~fcnCwj}O`GqF1-JUUZ0qy)*{;u-{_1@S_yXkW!4cr;KoJwsPpLtr&LEx1dCi1NiiFiW|(1f4R7 z=`a{qEu>b*I=B;tFl(z{pSqM(!niRX3EHe9naU*j7?QKfZ(e&B1*=kx?6c33%Ie-h zD&mcSr_;jO4Pu`R!rW7ABI{kVH9|RNPE-WII_Z9GpdX(eSVZ4zws37YzUq?c<(?6NBwBMtbUI^vpCE;6e)a z+a2xrRMo{9<7nkd=z^hdqgD71wGStJS|LG=JGt^T~y(mH37NVbfgdXxD`jQ#DTcQPP!rL(1pD|Fq`k5hOiM!eb3I}fXjW?KpqC9^ zShjpPbFp2YPe(==8|#!3lRBH66$!HW2UuyKG z$T#9#D%L#Amr3TxdjpL2UaX9LR$n>zt*WKjego(m^{}^-y|*-lDW1SMi4h+f&5jcW zGl`x~#Vog@d&a>i5y_t*94AMCUemyf;aEoEB#2MmQKk4$t+4_}dsxA1oH1Av-s#ch zZ$Qv=s6G>yPwDx|L8%}PHKH6}B+}}cz4&13dL)x=j~o|WPZMO}WlNK_pxB-5ly!Gh z79^T!-7B@%VnP!tg`K@{UgziQdWuc8i5QRA3=rUhFhs$^4DyY=ySoxK8(#b84QV~` zJLO1w@dd&B?{T(UdA{)`Ixe&uHb@hi_nA>+>&Qcqxhs{9)H-oZT4%b5GC%Qzss=%Z8(+;f9DH@5}Kd;$1ZytWimg9OC{hKM6Ls;&bW z@#$H$fc{WqeNvb^keyP3_&zPE3MJC1Y%2P1{X6H|#`=#x3(5PlTZ>dLltjKbtj4D4 zUhlJ7cb$0f6pXRfPez}s3`NtcQ2BuUwnY@-VLViHR8sShLmkeZ9R-1BLU8+$$h~19 z%6-V4qlmuh9DNuP{7Lodnj$V=UUN-`JW%{+=(3mcfx4e z>bLs*QhCnJY~ywCDi(638MTIp9){;~UD4CoNj@uII6@R^tJej!hdoiQF>et0L@MhU z+6EhEY2Rd*=4Ko`+hS)}XjnMA=Xh*oAU3DuI2i?#{08`jh6eXZ;K){Z)psUM#g6Gd z>9GHj)l3c}m6|Q4 z*R&SymY`qX0G6?4k%ZqeJFre*DhhA2f#dmI@}}~%wK7VuK;%2}mlF^E3Oe$t-^n0# ziR`r?vmQJJmmDnwkI5xlaHRg?s964(HeD`{k*0Ax!#`h-d-$wG_aoZ{-8o89fUPnq zf~)xarcyj%p=bFG@FOc!IP;{z2LcVo?}N_vpgtG@1A;BiTr1(C93ct!87UXk9kb#y z!teWxIl?{JT)-6+`cb#MT#R$o4#z+;$2u@yYQJr&=Fd*|i|tNpBWs;iWZEW983+v- zoN?S#h~G)ItHfLFx)(G&B+*25npDs(Iz}e;EtggfPonHb&-2B-Y{+!C9(P@dKCXzK zjhx_XjKs*iU=?!#NpTWw`SkXk;1-zs|Sgr%$q@Zldvu(}5|%f4tWhp)tDM~EpC z_EO*LRkRH&r1J>BxU`Q6(+avdsK@Z#9AsdY8Cn;VXzvP#TwX3XH zjTBF7ZKLkDZ*ODMd#KlR5yvLCGLdz-0Ntvu>Yq6pw!pZZ3GM2l++fiGr$2lHVq9xX zhnF!ZBX~MG#vX;mgjU!T`(Qpu8HopWP3Vx&U^mbtc2vQk;Zu)I+ z1a*znHp;;W`HDod@Yb-?)z5?m6L`v`I<6tm`t31l+GJZ2oVq-vbM?oep&h=7Qcm2p zbuP&0Oq}{1yc`qKFqOPb`#n@hQe)4h4G40xkt_`&nIR$B=ogTkeAKi#7a~0#JBcqB|^54YfeNyOW7ycoDkaDXab$O=zmed z{&oF+c_&c;jhn+Y_OhDEX!ymjepbUXa|Cs#+ z08jz>S8%{{`HKSuT>O7DWnc*PzsL74|L73hum4+rc$*6(;9k^P+q_iv8>{y*dX@AdBk z^zZS%@Za=-{@>Ym`oOrpr#}Y}`hVDX%)m4G#|BLQ|84)7z{7p`yMJHcvL6usKzs)x z0Eizz1OgERL@*E`K!gGj21EuB5kN!&5d}mv5HUc+0ucv9JP-*$Bm$8HL^2R5K%@eZ z21Gg#@8gcYBMZ2k4MYwQxj^Irkq<-x5QRV#0r5`yECHevi1&T|Y5(u0Ku*>bRR|pf zsji1IV-d1qP&OG(?iBbJk}ae!K>I z4kisPG=p_Izy;^=a~H3T9S_nU1fD6czcC6K^VP&*Jkom6#RNz~M4?l*+H|(K(~ny< z%*!=&!|)l@8|tT@M!uXg2{rYoKZVU%r_TKFFdM9mPTzJPEHnT51$Z$4MA@$VPZgYB*wcm{t9P+*Db^Y$~@z97-RAUX*TwScY zZU`&3NM0wk^ok%VNt*@kyKuBXl4aL7WYH*#(lMfHSh81EHEhN^6Yn!__uJ~2n~90D z>5)&?CvC?uj{B(+Gv4Fp5-aBt3VeKDD&&uJY`bk1%|6rs!=gr>64plK^;pm3h^*d-Ih(#F4l zJL6d{9an%pXM5Efdr@Af;C^CXmLk&(cleZRVM<0B(=Dbrvfio&pCGHB241Rrd9o~- zL$*Pac`>hrsM@orzd(A9L{=8rTprZXBumh`UU;ahc1$5>u=$-I(jv~BCYVHIz25fm znR~atwwp_xxjEuCxhW1dUCrRGF7;s*wey_cPvS<}@>;7uVlPCnmyPf9{SL&GuM-5h ze?TZPf;n)gYjPX8bDU}=j&K^?e1RqWa3yJXCB8PH^X#vmzdTepj!#^gk`-<0qJ<)# zj>C~7f;MD($o%3(EuKcPtghL17#6vQ-vl@pc|&aiw7>MrM?(~it%$PS7|LV13lBrC zS@8-A-^xmbKma=6#GwOuCTBmhC5!fjiNzF-TDY{((+QbU8P-40NT)F|=tJ1LwoZ^y zK%;Y#8KMeB?+vswE6+aT-%>1#7s_GAhXR_XOqrn|Z#WF$``guXTkJ+@`J{Uv=CqR^ zqLm7uvN8>IOGZ7%tPJXGq^v^f|K8n9;=li6;kIOuss$AMv1tN|#8)yO)TBMXH!T6E%ho|S9BcS#;*1ZRYw~c=~5>^o<}%&RaVg^kv<|aSZ4_0BK8gI z^8_QuLMyj5fN$9rst3@M3eb>nNCnE4t;|vhXD(XG@E*fmo+a(Y6lu))1fxlRE+-bH&f!apsNm@6su`NoP!j;=ZEyHP#q?W!0lX zIg8hta__j4_55{CIKu0iFJ4pW6l`Ce)Odw_Cu?>Q#9DEK?8omTGjRt=$?hVVgp`h! z(PBK{?pk+Ex}Cq`E@DJd&;@lANxeFtmmE&KlTmj2$C+&+7=-=TI^UVtGEbW~JvTXsVdNfLNgJj`2x;0T-mUYhpH zMKeCpBdrFf0j*hb+_*l3l0IyqBx54BS3SYVaBkI}R{DtUjG2m6hLYXNJHlf^ufqdW zw{M0h^;g0wia#eP^OgNOF^DD!`?<)x07zd;q7*H{-10d;s%WmT)85!Skub>A2*E&a zo^_TVaWk#qv->+&q>spo!o}aHY!+pnhHs=WSGMn*J4~PEPS;;gJ@+O`D7_&Vw`a=h z-4f$b`i@#2eGlw{!L?nl5^+9H7^yh40JSX-Gem{aoZErjbgo1E1&iSqm>h9vXCnn> zPOl=Y`9VQqG(=~4HSwfMTmomzq@fMdn^cQebofLl;KGO%j*?H>2lvAi{ja8l>u{nG z`jD?IiYPu1pt3$NS>Y<12N0IemP@~D1s)8-m@9xO`W5>jdohxSo!RS^pW@bEl&?5v z0XEl}-}gqqD}N%82}_%T;%sGi$-3$pdGPZ<>RfT^h<4sAcmQ0vYH>T(RJ4k11|p@Ha%nMk%;xC=V9c} zc%>T?E?ds{#h?dH5N`ABIfjyMM3mLjXrL8i`emHbnG-$9TN8nzvm|U^ARcT-Z*%5% zN>?eXjw$zI7J{mH)U{UU@`0t~jTzLX_LtM1-^iHHAV|&6E%r6OYbaE7pCNA(fFqV*1EI)r&2i1)(a?4Vzb>bJa0 z*M`JB?rq{HLGKpYhTmU={wE!r>d5`WsB0v3!##_cCftpqlIg>_7Yq3PiU=WusyOSi zaOM=`QT|`=pN4;bAJC2Qk}8+;mH+S1eu4=|_$UASKgs|8FVg;ZfpBe8vhs4UajwHN z>^V^P@jTa4dE;F84dBKpxQyvC)n00Im+RezmwgJy1ssyN;c2R4Jwo<2ApNiXM5x@q zj6br^S-oBZL&ouBn|R_L{RHmM{xmgAFj?Ckexu>thWm2x3&~V%L-?`0V?F%!+CC8I zDhGJ%ocDwAaV8C>IYEaBb ze**t!zF*+{Cx89_l=i>N9!cwZYV>*a&T7951PbU=X`Ork6$_3mPcZ_3F@UjIak1d@ zlPowC3+y)?bJ_M;fRAx{hJ& z{KDiUQa*vwvz*pN&*ntIFGY(rV9>GbumFY`rME)>k@>`XX{H5WjM9pQROnlxkf+-z zBl0N*#z`pKiTR&nBd!5SV>HuY@-I{%71WJ|DG&hIrb6`Xw7Q+?C}aWzmK67!q80pN zpTHDAmco1#XoR^C`qX>|vm^vbiV(-NgD8j)G4QyiAdPv})cb`PxO+Yj+nLQtX8Faw zY-iNWDS>t@zs3N(ex~DQh^8P&EP)~F2K4|gmS5&R4J_G3p#4V{tire~4*ZB?_-3us zw^< z;-yqHXG`q(QPHF*!Y-vKqL36srC4xa3czZYQ&y)$SOCC0tNSg<0sxUgpF5S&t^;Jr znwjC|0~o`F*Qm$lqb9+Hn0CUmzz&?ES&{eRj{2` zzzSf`#~wqPPO0m3Eez2;l}C*8u~6WeSx#Q}A*egMo-NFX0~m*hBLL8w@=k>S9C9h* z5CHE#t-v8vHHgLpF7?0(UCt11l>6KqI8o&cawdISp9M~GLQxJ3zuSs{Q%)$+pJM4x z@x%AGM&!Th@3%j7Kd=o>DR-<>+8+GBL;a2L&-(lSl=AOS|J`DSU+${us>RNUSE#)d zutV?fD@?02WA)u&*(kG$?r_*~K7JqrZU_%PpyBBc?+=9-0&d6!ZjZFfwae-H&+Q0w UKvkvrFZx&BpNRiy|2PHy2dA4!yZ`_I diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index afcf58b7..22df7fd6 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -14,7 +14,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletins = Bulletin.search(params[:search], params[:category_id]) # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]]) - @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.limit(1).desc("postdate") + @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all @bulletin_categories = BulletinCategory.all @bulletin_link = BulletinLink.new diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb index 05894515..c4d60b9b 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb @@ -16,6 +16,15 @@ class BulletinFile belongs_to :bulletin # embedded_in :bulletin + before_save :set_key + + def filetitle + @filetitle ||= I18nVariable.first(:conditions => {:key => 'filetitle', :language_value_id => self.id, :language_value_type => self.class}) rescue nil + end + + def description + @description ||= I18nVariable.first(:conditions => {:key => 'description', :language_value_id => self.id, :language_value_type => self.class}) rescue nil + end protected 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 bf02b054..7f1b5626 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 @@ -5,7 +5,6 @@

      • <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %>
        • -
      • <%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %>
      • <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
      diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb deleted file mode 100644 index 7db1d0f8..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb +++ /dev/null @@ -1,3 +0,0 @@ -$.each($(".quick_edit"),function(obj){ $(this).remove(); }); -$("#<%= dom_id @bulletin_category %>").append("
      <%= j render "form" %>
      "); -//$("#form > form").replaceWith("<%= j render "form" %>"); 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 4aedb45a..c569c89a 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 @@ -1,17 +1,6 @@ <% # encoding: utf-8 %> <%= f.error_messages %> - <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %> -
      - <%= label :fact_check_stat, t('announcement.bulletin.fact_check_stat') %> - <%= f.radio_button :is_checked, true%> - <%= label :is_checked_true, t('announcement.bulletin.fact_check_pass') %> - <%= f.radio_button :is_checked, false, (@bulletin.is_checked.nil?? {:checked => true} : {}) %> - <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass') %> - - <%= label :is_checked_false, t('announcement.bulletin.fact_check_not_pass_reason') %> - <%= f.text_field :not_checked_reason %> -
      @@ -103,57 +92,47 @@ <%= f.label :category %> <%= 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| %> + +
      "> -
      - - English - - - -
      - -
      - <%= f.label :title %> - <%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %> - <% @site_valid_locales.each do |locale| %> - +
      + <%= f.label :title %> + <%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_field locale, :class=>'post-title' %> - - <% end %> - <% end %> -
      + <% end %> +
      -
      - <%= f.label :subtitle %> - <%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %> - <% @site_valid_locales.each do |locale| %> - +
      + <%= f.label :subtitle %> + <%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%" %> - - <% end %> - <% end %> -
      + <% end %> +
      -
      - <%= f.label :text %> - <%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %> - <% @site_valid_locales.each do |locale| %> - +
      + <%= f.label :text %> + <%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%" %> - - <% end %> + <% end %> +
      + +
      + <% end %> +
      @@ -171,10 +150,7 @@ URL - <% @site_valid_locales.each do |locale| %> -
      - Name - <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> - <% end %> + Name diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb index 65ac2fb8..0f332069 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb @@ -8,29 +8,53 @@
      - <%= f.fields_for :filetitle, (form_bulletin_file.new_record? ? form_bulletin_file.build_filetitle : form_bulletin_file.filetitle ) do |f| %> - <% @site_valid_locales.each do |locale| %> -
      - -
      - <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> -
      + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + <%= f.fields_for :filetitle, (form_bulletin_file.new_record? ? form_bulletin_file.build_filetitle : form_bulletin_file.filetitle ) do |f| %> +
      + +
      + <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> +
      +
      + <% end %> +
      - <% end %> - <% end %> - - - <%= f.fields_for :description, (form_bulletin_file.new_record? ? form_bulletin_file.build_description : form_bulletin_file.description ) do |f| %> - <% @site_valid_locales.each do |locale| %> -
      - -
      - <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> -
      -
      - <% end %> - <% end %> + + <% end %> + +
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + <%= f.fields_for :description, (form_bulletin_file.new_record? ? form_bulletin_file.build_description : form_bulletin_file.description ) do |f| %> +
      + +
      + <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> +
      +
      + <% end %> + +
      + + <% end %> + +
      + + <% if form_bulletin_file.new_record? %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb index 560e561d..cfd91358 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb @@ -8,19 +8,29 @@
      - - <%= f.fields_for :i18n_variable, (form_bulletin_link.new_record? ? form_bulletin_link.build_i18n_variable : form_bulletin_link.i18n_variable) do |f| %> - <% @site_valid_locales.each do |locale| %> -
      -
      - <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> -
      -
      - - + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> - <% end %> - <% end %> +
      "> + + <%= f.fields_for :i18n_variable, (form_bulletin_link.new_record? ? form_bulletin_link.build_i18n_variable : form_bulletin_link.i18n_variable) do |f| %> +
      + +
      + <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> +
      +
      + <% end %> + +
      + + <% end %> + +
      diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index 22f55005..a2168f02 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -14,9 +14,7 @@ Rails.application.routes.draw do match "file_quick_edit/:bulletin_id" => "bulletins#file_quick_edit" ,:as => :file_quick_edit end - resources :bulletin_categorys, :controller => 'bulletin_categorys' do - match "quick_edit/:bulletin_category_id" => "bulletin_categorys#quick_edit" ,:as => :quick_edit - end + resources :bulletin_categorys resources :bulletin_links, :controller => 'bulletin_links' do match "link_quick_edit/:bulletin_link_id" => "bulletin_links#link_quick_edit" ,:as => :link_quick_edit diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb index 054a4650..63c1db95 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb @@ -9,16 +9,30 @@ <%= @page_context.page.i18n_variable[I18n.locale] %>
      -
      - <%= f.label :context %> - <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> - <% @site_valid_locales.each do |locale| %> - + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + +
      + <%= f.label :context %> + <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%" %> - - <% end %> + <% end %> +
      + +
      + <% end %> +
      diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb index de163012..22c20688 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb @@ -44,51 +44,44 @@ <%= f.label :category %> <%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %> - -
      - - English - - - -
      - -
      - <%= f.label :name %> - <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title' %> - - <% end %> + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> +
      + <%= f.label :name %> + <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_field locale, :class=>'post-title' %> + <% end %> +
      + +
      + <%= f.label :describe %> + <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_area locale, :style=>"width:100%" %> + <% end %> +
      + +
      + + <% end %> +
      <%= f.label :url %> <%= f.text_field :url %>
      - -
      - <%= f.label :describe %> - <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%" %> - - <% end %> - <% end %> -
      From 1259d62249c0982e59b425084eb7687064e64748 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 5 Apr 2012 14:55:41 +0800 Subject: [PATCH 089/125] Fix mainTablePosition in js -> remove the notable class --- app/assets/javascripts/orbit-1.0.js | 17 +++++++++-------- app/views/admin/tags/index.html.erb | 2 +- .../back_end/fact_checks/setting.html.erb | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index a894beea..e83c69f6 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -79,20 +79,21 @@ $(window).resize(function(){ /*main-table position*/ function mainTablePosition() { var $height = $('#main-wrap .subnav').length && $('#main-wrap .subnav').height(); - var $table = $('#main-wrap > .table').length && $('#main-wrap > .table'); - var $nottable = $('#main-wrap .nottable').length && $('#main-wrap .nottable'); - //alert ($table.height()) - if($nottable==0){ + var $table = $('#main-wrap > table').length && $('#main-wrap > table'); + if($table && $table==0){ + $table.css({marginTop:$height}); + } + else if($table){ if($height>0){ $height = $height-17; } $table.stop().animate({marginTop:$height},500); } - if($table==0){ - $nottable.css({marginTop:$height}); + else if($('#main-wrap .subnav')){ + var $object = $('#main-wrap .subnav').next(); + $object.css({marginTop:$height}); }; - //$table.css({marginTop : $height}) -} +}; $(window).scroll(function () { //var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-1; //var $subnavWidth = parseInt($('#main-wrap > .subnav').css("width")); diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index a8a1aa34..cca4b6af 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -8,7 +8,7 @@
      -
      +
      <%= render :partial => 'tag', :collection => @tags %>
      diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb index 16e76f09..251d8346 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb @@ -11,7 +11,7 @@
      <%#= label_tag :role, t("admin.roles") %> -
      +
      <%= content_tag :div do -%> <% form_tag :action => "update_setting" do %> <%= render :partial => "privilege_user", :locals => {:users => @users_array} %> From ef88c2dbc2142ebeaca1040679d677c63437d7e4 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 5 Apr 2012 15:06:01 +0800 Subject: [PATCH 090/125] fact_check with Ray's permission check. needs Ray's new css --- app/assets/javascripts/.DS_Store | Bin 6148 -> 6148 bytes .../javascripts/inc/permission-checkbox.js | 20 ++++++++++-------- .../fact_checks/_privilege_user.html.erb | 20 ++++++++++++++++-- .../back_end/fact_checks/setting.html.erb | 6 ++++++ 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/.DS_Store b/app/assets/javascripts/.DS_Store index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..51582ef8aa6a5ea474683aee9d3de008e14c257f 100644 GIT binary patch delta 334 zcmZoMXfc=|#>B`mF;Q%yo}vgd0|Nsi1A_nqLtaX8a!yiyeh%Zr#1-`*aaM*zh7^We zhD;lOn7EqN`ARh zeksuC=-`a}^5D#r)TG3sSTMUJv81%vDX|DF6OdSv0h9r=Lx66m2XbPd%EL2LN;2XF z#Hy<;jLmcujB9lis?E&}bQDZXO=@d7IXF25UUP^l>DhRMBvw_|)YbuA1O$vgZ-D_X zl!j3aKnBzgWx+*xIr(|%KoOW~h^mcw|5zs*h_Gzt=HTW4hStW!@640=MHE??fbt5H N4Ml`Edx-2|1^}?8QM>>E delta 70 zcmZoMXfc=|#>AjHu~2NHo+1YW5HK<@2yA9#Vq@DZz_f~SGdl-A2T%b} "users_checkbox_ary", do -%> <% sys_users = User.all -%> <% sys_users.each do |user| -%> - <%= label_tag "lab-user-#{user.id}", user.name rescue '' -%> - <%= check_box_tag "[users][#{user.id}]", 'true',users.include?(user) -%> + +
      +
      +
      + +
      +
      + <% if user.avatar? %> + <%= image_tag(user.avatar.thumb.url,:class => "member-img") %> + <% else %> + <%= image_tag "person.png",:class => "member-img" %> + <% end %> +
      + <%= label_tag "lab-user-#{user.id}", (user.name rescue ''),:class=>"member-name",:id=>nil -%> + <%= check_box_tag "[users][#{user.id}]", 'true',users.include?(user),:class => "check" -%> +
      +
      + <% end -%> <% end -%> \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb index 16e76f09..a4c903c7 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb @@ -1,3 +1,9 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "inc/permission-checkbox" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "inc/permission-checkbox" %> +<% end %> <%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %> <%= form_tag('', :remote => true) %>
      From d45725cf3bdcca58155438d512cf6f250971f96b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Apr 2012 14:48:31 +0800 Subject: [PATCH 091/125] fix announcement & add lang tab --- app/assets/images/Thumbs.db | Bin 62976 -> 0 bytes lib/fraisier/images/Thumbs.db | Bin 39936 -> 0 bytes .../back_end/bulletins_controller.rb | 2 +- .../announcement/app/models/bulletin_file.rb | 9 ++ .../_bulletin_category.html.erb | 1 - .../bulletin_categorys/quick_edit.js.erb | 3 - .../back_end/bulletins/_form.html.erb | 85 +++++++----------- .../bulletins/_form_bulletin_file.html.erb | 66 +++++++++----- .../bulletins/_form_bulletin_link.html.erb | 34 ++++--- .../announcement/config/routes.rb | 4 +- .../back_end/page_contexts/_form.html.erb | 28 ++++-- .../back_end/web_links/_form.html.erb | 69 +++++++------- 12 files changed, 164 insertions(+), 137 deletions(-) delete mode 100644 app/assets/images/Thumbs.db delete mode 100755 lib/fraisier/images/Thumbs.db delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb diff --git a/app/assets/images/Thumbs.db b/app/assets/images/Thumbs.db deleted file mode 100644 index f9d32b5f625bf17a3cde65784f73ba03f1ea1bdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62976 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 UKvkvrFZx&BpNRiy|2PHy2dA4!yZ`_I diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 47c97b29..cffe2585 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -13,7 +13,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletins = Bulletin.search(params[:search], params[:category_id]) # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]]) - @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all.desc("postdate").page(params[:page]).per(10) + @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all @bulletin_categories = BulletinCategory.all @bulletin_link = BulletinLink.new diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb index 05894515..c4d60b9b 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb @@ -16,6 +16,15 @@ class BulletinFile belongs_to :bulletin # embedded_in :bulletin + before_save :set_key + + def filetitle + @filetitle ||= I18nVariable.first(:conditions => {:key => 'filetitle', :language_value_id => self.id, :language_value_type => self.class}) rescue nil + end + + def description + @description ||= I18nVariable.first(:conditions => {:key => 'description', :language_value_id => self.id, :language_value_type => self.class}) rescue nil + end protected 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 bf02b054..7f1b5626 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 @@ -5,7 +5,6 @@

      • <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %>
        • -
      • <%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %>
      • <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
      diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb deleted file mode 100644 index 7db1d0f8..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb +++ /dev/null @@ -1,3 +0,0 @@ -$.each($(".quick_edit"),function(obj){ $(this).remove(); }); -$("#<%= dom_id @bulletin_category %>").append("
      <%= j render "form" %>
      "); -//$("#form > form").replaceWith("<%= j render "form" %>"); 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 4496cdef..59c2c92e 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 @@ -132,60 +132,47 @@ <%= f.label :category %> <%= 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| %> + +
      "> +
      - -
      -
      -
      + <%= f.label :title %> + <%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_field locale, :class=>'post-title' %> + <% end %> +
      +
      - -
      -
      -
      + <%= f.label :subtitle %> + <%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_area locale, :style=>"width:100%" %> + <% end %> +
      + +
      + <%= f.label :text %> + <%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_area locale, :style=>"width:100%" %> + <% end %> +
      +
      -
      -
      - <%= f.label :title %> - <%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title' %> - - <% end %> - <% end %> -
      - -
      - <%= f.label :subtitle %> - <%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> - - <% end %> - <% end %> -
      - -
      - <%= f.label :text %> - <%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> - - <% end %> <% end %> +
      @@ -202,11 +189,7 @@ URL - <% @site_valid_locales.each do |locale| %> -
      - Name - <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %> -
      - <% end %> + Name diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb index 65ac2fb8..0f332069 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb @@ -8,29 +8,53 @@
      - <%= f.fields_for :filetitle, (form_bulletin_file.new_record? ? form_bulletin_file.build_filetitle : form_bulletin_file.filetitle ) do |f| %> - <% @site_valid_locales.each do |locale| %> -
      - -
      - <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> -
      + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + <%= f.fields_for :filetitle, (form_bulletin_file.new_record? ? form_bulletin_file.build_filetitle : form_bulletin_file.filetitle ) do |f| %> +
      + +
      + <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> +
      +
      + <% end %> +
      - <% end %> - <% end %> - - - <%= f.fields_for :description, (form_bulletin_file.new_record? ? form_bulletin_file.build_description : form_bulletin_file.description ) do |f| %> - <% @site_valid_locales.each do |locale| %> -
      - -
      - <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> -
      -
      - <% end %> - <% end %> + + <% end %> + +
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + <%= f.fields_for :description, (form_bulletin_file.new_record? ? form_bulletin_file.build_description : form_bulletin_file.description ) do |f| %> +
      + +
      + <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> +
      +
      + <% end %> + +
      + + <% end %> + +
      + + <% if form_bulletin_file.new_record? %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb index 560e561d..cfd91358 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb @@ -8,19 +8,29 @@
      - - <%= f.fields_for :i18n_variable, (form_bulletin_link.new_record? ? form_bulletin_link.build_i18n_variable : form_bulletin_link.i18n_variable) do |f| %> - <% @site_valid_locales.each do |locale| %> -
      -
      - <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> -
      -
      - - + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> - <% end %> - <% end %> +
      "> + + <%= f.fields_for :i18n_variable, (form_bulletin_link.new_record? ? form_bulletin_link.build_i18n_variable : form_bulletin_link.i18n_variable) do |f| %> +
      + +
      + <%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge" %> +
      +
      + <% end %> + +
      + + <% end %> + +
      diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index 7ac33a90..fc1ef4f0 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -17,9 +17,7 @@ Rails.application.routes.draw do match "file_quick_edit/:bulletin_id" => "bulletins#file_quick_edit" ,:as => :file_quick_edit end - resources :bulletin_categorys, :controller => 'bulletin_categorys' do - match "quick_edit/:bulletin_category_id" => "bulletin_categorys#quick_edit" ,:as => :quick_edit - end + resources :bulletin_categorys resources :bulletin_links, :controller => 'bulletin_links' do match "link_quick_edit/:bulletin_link_id" => "bulletin_links#link_quick_edit" ,:as => :link_quick_edit diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb index 3c734bb0..595973d3 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb @@ -9,16 +9,30 @@ <%= @page_context.page.i18n_variable[I18n.locale] %>
      -
      - <%= f.label :context %> - <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> - <% @site_valid_locales.each do |locale| %> - + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + +
      + <%= f.label :context %> + <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> - - <% end %> + <% end %> +
      + +
      + <% end %> +
      diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb index de163012..22c20688 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb @@ -44,51 +44,44 @@ <%= f.label :category %> <%= f.select :web_link_category_id, @web_link_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %> - -
      - - English - - - -
      - -
      - <%= f.label :name %> - <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title' %> - - <% end %> + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> +
      + <%= f.label :name %> + <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_field locale, :class=>'post-title' %> + <% end %> +
      + +
      + <%= f.label :describe %> + <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %> + <%= I18nVariable.from_locale(locale) %> + <%= f.text_area locale, :style=>"width:100%" %> + <% end %> +
      + +
      + + <% end %> +
      <%= f.label :url %> <%= f.text_field :url %>
      - -
      - <%= f.label :describe %> - <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %> - <% @site_valid_locales.each do |locale| %> - - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%" %> - - <% end %> - <% end %> -
      From 4da03026a4d04517c53addf044a859cc06221040 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 5 Apr 2012 15:28:43 +0800 Subject: [PATCH 092/125] Fix pagination bug in bulletins --- .../panel/announcement/back_end/bulletins_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index cffe2585..e8b899eb 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -13,7 +13,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController # @bulletins = Bulletin.search(params[:search], params[:category_id]) # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]]) - @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all + @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all.page(params[:page]).per(10) @bulletin_categories = BulletinCategory.all @bulletin_link = BulletinLink.new From ef8eb0450bd8a181efc96a568fe47fa333e0a9e7 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 5 Apr 2012 17:28:21 +0800 Subject: [PATCH 093/125] Changes in tinymce bar --- app/assets/javascripts/tinymce_orbit.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/tinymce_orbit.js b/app/assets/javascripts/tinymce_orbit.js index 89fb9390..60492914 100644 --- a/app/assets/javascripts/tinymce_orbit.js +++ b/app/assets/javascripts/tinymce_orbit.js @@ -4,14 +4,13 @@ $(function() { plugins : "autolink,lists,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template", // Theme options - theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect", - theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor", - theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen", - theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage", + theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect", + theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,bullist,numlist,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,forecolor,backcolor", + theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,fullscreen", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_statusbar_location : "bottom", - theme_advanced_resizing : false, + theme_advanced_resizing : true, // Skin options skin : "o2k7", From 1a6242edbd0151b82416928130858bb320e3671f Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 5 Apr 2012 11:11:48 +0800 Subject: [PATCH 094/125] fix ad_banner sidebar --- config/locales/zh_tw.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index a4ce62b6..491d80e8 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -40,8 +40,11 @@ zh_tw: action: 雿 ad_banner: 撱頛芣 ad: - title: 璅憿 ab_fx: 頧渡寞 + all_banners: 頛芣剜 + new_banner: 啣頛芣 + new_image: 啣璈怠 + title: 璅憿 transition_sec: 頧游桐 trans_unit_sec: 蝘 add: 啣 From 01bda515a694eee4fa1f3af0a29372614ae2a9a2 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 5 Apr 2012 15:06:01 +0800 Subject: [PATCH 095/125] fact_check with Ray's permission check. needs Ray's new css --- app/assets/javascripts/.DS_Store | Bin 6148 -> 6148 bytes .../javascripts/inc/permission-checkbox.js | 20 ++++++++++-------- .../fact_checks/_privilege_user.html.erb | 20 ++++++++++++++++-- .../back_end/fact_checks/setting.html.erb | 6 ++++++ 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/.DS_Store b/app/assets/javascripts/.DS_Store index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..51582ef8aa6a5ea474683aee9d3de008e14c257f 100644 GIT binary patch delta 334 zcmZoMXfc=|#>B`mF;Q%yo}vgd0|Nsi1A_nqLtaX8a!yiyeh%Zr#1-`*aaM*zh7^We zhD;lOn7EqN`ARh zeksuC=-`a}^5D#r)TG3sSTMUJv81%vDX|DF6OdSv0h9r=Lx66m2XbPd%EL2LN;2XF z#Hy<;jLmcujB9lis?E&}bQDZXO=@d7IXF25UUP^l>DhRMBvw_|)YbuA1O$vgZ-D_X zl!j3aKnBzgWx+*xIr(|%KoOW~h^mcw|5zs*h_Gzt=HTW4hStW!@640=MHE??fbt5H N4Ml`Edx-2|1^}?8QM>>E delta 70 zcmZoMXfc=|#>AjHu~2NHo+1YW5HK<@2yA9#Vq@DZz_f~SGdl-A2T%b} "users_checkbox_ary", do -%> <% sys_users = User.all -%> <% sys_users.each do |user| -%> - <%= label_tag "lab-user-#{user.id}", user.name rescue '' -%> - <%= check_box_tag "[users][#{user.id}]", 'true',users.include?(user) -%> + +
      +
      +
      + +
      +
      + <% if user.avatar? %> + <%= image_tag(user.avatar.thumb.url,:class => "member-img") %> + <% else %> + <%= image_tag "person.png",:class => "member-img" %> + <% end %> +
      + <%= label_tag "lab-user-#{user.id}", (user.name rescue ''),:class=>"member-name",:id=>nil -%> + <%= check_box_tag "[users][#{user.id}]", 'true',users.include?(user),:class => "check" -%> +
      +
      + <% end -%> <% end -%> \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb index 251d8346..cf5cf13c 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb @@ -1,3 +1,9 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "inc/permission-checkbox" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "inc/permission-checkbox" %> +<% end %> <%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %> <%= form_tag('', :remote => true) %>
      From ad740b0daf6fea97f805d9439752353954a876a7 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 5 Apr 2012 18:13:52 +0800 Subject: [PATCH 096/125] Missing end tag in side_bar --- app/views/layouts/_side_bar.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index b37aaa94..3a36a48a 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -36,6 +36,7 @@ <%= content_tag :li, link_to(t('admin.new_ad_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %> <%= content_tag :li, link_to(t('admin.new_ad_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %> <% end %> +<% end %> <%= content_tag :li, :class => active_for_controllers('web_links', 'tags', 'web_link_categorys') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.link'), panel_web_resource_back_end_web_links_path %> From d1dce81b3efc82e96341538e6033599e49852689 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 5 Apr 2012 18:27:23 +0800 Subject: [PATCH 097/125] factcheck status for and --- .../announcement/app/models/bulletin.rb | 11 +++++++++++ .../back_end/bulletins/_bulletin.html.erb | 1 + .../announcement/config/locales/zh_tw.yml | 1 + 3 files changed, 13 insertions(+) diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index e24f7f21..4808b3a9 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -79,6 +79,17 @@ class Bulletin end + def status + case self.is_checked + when nil + I18n.t('announcement.bulletin.fact_check_pending') + when true + I18n.t('announcement.bulletin.fact_check_pass') + when false + I18n.t('announcement.bulletin.fact_check_not_pass') + end + end + def is_expired? Date.today > self.deadline ? true : false rescue false #some dates might sat as nil so rescue false diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index 62b28c0c..73d37efd 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -10,6 +10,7 @@ <% if bulletin.is_hidden? %> <%= t(:hidden) %> <% end %> + <%= bulletin.status %> <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml index e2dfd957..bee4b04e 100644 --- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml @@ -33,6 +33,7 @@ zh_tw: fact_check: 砍撖拇 fact_check_setting: 撖拇貉身摰 fact_check_stat: 撖拇貊瘜 + fact_check_pending: 撖拇訾葉 fact_check_not_pass: '銝' fact_check_pass: '' fact_check_not_pass_reason: '銝' From fd5c082225b51c6c4cbd389b6053973c17a16591 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 5 Apr 2012 18:30:45 +0800 Subject: [PATCH 098/125] fix i18n var for fact check pending --- vendor/built_in_modules/announcement/config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml index 6143b177..b21546f8 100644 --- a/vendor/built_in_modules/announcement/config/locales/en.yml +++ b/vendor/built_in_modules/announcement/config/locales/en.yml @@ -40,6 +40,7 @@ en: fact_check_stat: Fact Check Status fact_check_not_pass: 'Not Pass' fact_check_not_pass_reason: 'Reason' + fact_check_pending: 'Pending' fact_check_pass: 'Pass' # admin: # action: Action From ab460841908334188ad5203e077e87463a987dd7 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Fri, 6 Apr 2012 17:31:22 +0800 Subject: [PATCH 099/125] Fix bugs in upload design and missing menu --- app/models/design/design.rb | 7 +++---- app/models/design/stylesheet.rb | 1 + lib/parsers/parser_common.rb | 4 ++-- lib/parsers/parser_layout.rb | 19 ++++++++----------- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/app/models/design/design.rb b/app/models/design/design.rb index 7fbacedc..2a25dd11 100644 --- a/app/models/design/design.rb +++ b/app/models/design/design.rb @@ -1,6 +1,7 @@ class Design include Mongoid::Document include Mongoid::Timestamps + include ParserLayout field :title field :author @@ -14,7 +15,7 @@ class Design embeds_one :reset_css, :class_name => "Stylesheet", :cascade_callbacks => true embeds_many :themes, :cascade_callbacks => true embeds_many :javascripts, :cascade_callbacks => true - embeds_many :images, :cascade_callbacks => true + embeds_many :images, :as => :design_image, :cascade_callbacks => true # embeds_many :custom_images, :class_name => 'Image', :cascade_callbacks => true validates_presence_of :title @@ -65,9 +66,6 @@ class Design protected def parse_css_for_images - self.images.each do |image| - image.save - end if (self.default_css && self.default_css.changed) self.default_css.parse_urls end @@ -76,6 +74,7 @@ class Design theme.parse_urls end end + parse_body_for_images(self) end end diff --git a/app/models/design/stylesheet.rb b/app/models/design/stylesheet.rb index 4b908122..bb2ec85e 100644 --- a/app/models/design/stylesheet.rb +++ b/app/models/design/stylesheet.rb @@ -27,6 +27,7 @@ class Stylesheet < DesignFile temp_file = File.new(dir + '/' + orig_file_name, 'w+') temp_file.write content.force_encoding("UTF-8") self.file = temp_file + self.save } end diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 96cbb4b9..135c3e43 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -2,7 +2,7 @@ module ParserCommon def menu_level(page, current, menu, edit = false) res = '' - if current <= menu.levels + if menu.levels > 0 && current <= menu.levels if current != 0 res << "
      " item = rand(100000) @@ -74,7 +74,7 @@ module ParserCommon body.css('.page_image').each do |page_image| # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image + image = page.design.images.detect{|image| image.name.eql?(File.basename(page_image['src'])) } unless image if image res = " content['name']) end - body.css('.page_image').each do |image| - image = layout.design.images.detect{ |i| i.file_identifier.eql?(parse_html_image(image.to_html)) } - image.update_attributes(:name => image['name'], :html_id => image['id'], :html_class => image['class']) if image - end - body.css('.page_menu').each do |menu| layout.build_menu(:levels => 0, :values => {}) unless layout.menu layout.menu.levels = i = menu['level'].to_i @@ -22,12 +17,14 @@ module ParserLayout end - def parse_html_image(html) - html.scan(/(?<=\)/){ - $1.gsub(' ','').scan(/(?<=src=\")(.*?)(?=\")/){ - return File.basename($1).gsub(/[\\\"]/, '') - } - } + def parse_body_for_images(design) + body = Nokogiri::HTML(design.layout.body) + + body.css('.page_image').each do |page_image| + image = design.images.where( file: File.basename(page_image['src']))[0] + image.update_attributes(:name => File.basename(page_image['src']), :html_id => page_image['id'], :html_class => page_image['class']) if image + end + end From 6f9363ef5432d8e863fbe650b929ec5d8c51b941 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Fri, 6 Apr 2012 17:31:22 +0800 Subject: [PATCH 100/125] Fix bugs in upload design and missing menu --- app/models/design/design.rb | 7 +++---- app/models/design/stylesheet.rb | 1 + lib/parsers/parser_common.rb | 4 ++-- lib/parsers/parser_layout.rb | 19 ++++++++----------- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/app/models/design/design.rb b/app/models/design/design.rb index 7fbacedc..2a25dd11 100644 --- a/app/models/design/design.rb +++ b/app/models/design/design.rb @@ -1,6 +1,7 @@ class Design include Mongoid::Document include Mongoid::Timestamps + include ParserLayout field :title field :author @@ -14,7 +15,7 @@ class Design embeds_one :reset_css, :class_name => "Stylesheet", :cascade_callbacks => true embeds_many :themes, :cascade_callbacks => true embeds_many :javascripts, :cascade_callbacks => true - embeds_many :images, :cascade_callbacks => true + embeds_many :images, :as => :design_image, :cascade_callbacks => true # embeds_many :custom_images, :class_name => 'Image', :cascade_callbacks => true validates_presence_of :title @@ -65,9 +66,6 @@ class Design protected def parse_css_for_images - self.images.each do |image| - image.save - end if (self.default_css && self.default_css.changed) self.default_css.parse_urls end @@ -76,6 +74,7 @@ class Design theme.parse_urls end end + parse_body_for_images(self) end end diff --git a/app/models/design/stylesheet.rb b/app/models/design/stylesheet.rb index 4b908122..bb2ec85e 100644 --- a/app/models/design/stylesheet.rb +++ b/app/models/design/stylesheet.rb @@ -27,6 +27,7 @@ class Stylesheet < DesignFile temp_file = File.new(dir + '/' + orig_file_name, 'w+') temp_file.write content.force_encoding("UTF-8") self.file = temp_file + self.save } end diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index bd05a4e8..93ea2608 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -2,7 +2,7 @@ module ParserCommon def menu_level(page, current, menu, edit = false) res = '' - if current <= menu.levels + if menu.levels > 0 && current <= menu.levels if current != 0 res << "
      " item = rand(100000) @@ -84,7 +84,7 @@ module ParserCommon body.css('.page_image').each do |page_image| # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image - image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image + image = page.design.images.detect{|image| image.name.eql?(File.basename(page_image['src'])) } unless image if image res = " content['name']) end - body.css('.page_image').each do |image| - image = layout.design.images.detect{ |i| i.file_identifier.eql?(parse_html_image(image.to_html)) } - image.update_attributes(:name => image['name'], :html_id => image['id'], :html_class => image['class']) if image - end - body.css('.page_menu').each do |menu| layout.build_menu(:levels => 0, :values => {}) unless layout.menu layout.menu.levels = i = menu['level'].to_i @@ -22,12 +17,14 @@ module ParserLayout end - def parse_html_image(html) - html.scan(/(?<=\)/){ - $1.gsub(' ','').scan(/(?<=src=\")(.*?)(?=\")/){ - return File.basename($1).gsub(/[\\\"]/, '') - } - } + def parse_body_for_images(design) + body = Nokogiri::HTML(design.layout.body) + + body.css('.page_image').each do |page_image| + image = design.images.where( file: File.basename(page_image['src']))[0] + image.update_attributes(:name => File.basename(page_image['src']), :html_id => page_image['id'], :html_class => page_image['class']) if image + end + end From fa441814f378e92034d46f87f42f05c951c1c0b3 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 6 Apr 2012 17:46:50 +0800 Subject: [PATCH 101/125] A filter UI for permission select. with Harry's JS --- .../javascripts/inc/permission-checkbox.js | 12 +++-- .../stylesheets/inc/permission-checkbox.css | 53 ------------------- .../fact_checks/_privilege_user.html.erb | 11 ++-- .../back_end/fact_checks/setting.html.erb | 6 +++ .../announcement/config/locales/en.yml | 2 + .../announcement/config/locales/zh_tw.yml | 2 +- 6 files changed, 25 insertions(+), 61 deletions(-) delete mode 100644 app/assets/stylesheets/inc/permission-checkbox.css diff --git a/app/assets/javascripts/inc/permission-checkbox.js b/app/assets/javascripts/inc/permission-checkbox.js index e314d2aa..78a50759 100644 --- a/app/assets/javascripts/inc/permission-checkbox.js +++ b/app/assets/javascripts/inc/permission-checkbox.js @@ -1,14 +1,20 @@ $(document).ready(function() { - $('.check[checked="checked"]').parents(".checkbox").addClass("checked"); + $('.check[checked="checked"]').parents(".checkbox").addClass("checked") $(".checkbox").click(function(){ if($(this).children(".check").attr("checked")){ // uncheck - $(this).children(".check").attr('checked', false); - $(this).removeClass("checked"); + $(this).children(".check").attr('checked', false); + $(this).removeClass("checked"); }else{ // check $(this).children(".check").attr({checked: "checked"}); $(this).addClass("checked"); } }); + $(".checkbox").popover({ + trigger: 'hover', + placement: 'bottom', + delay: { show: 100, hide: 300 }, + }); + //$(".checkbox").popover('toggle'); }); \ No newline at end of file diff --git a/app/assets/stylesheets/inc/permission-checkbox.css b/app/assets/stylesheets/inc/permission-checkbox.css deleted file mode 100644 index 9d7beb5e..00000000 --- a/app/assets/stylesheets/inc/permission-checkbox.css +++ /dev/null @@ -1,53 +0,0 @@ -.checkblock { - display: inline-block; - float: left; - width: 200px; -} -.check[type="checkbox"]{ - display:none; -} -.checkbox{ - padding:5px; - margin:5px; - display: inline-block; - color:#777777; - text-shadow: 0 1px 0px rgba(255,255,255,.4); - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - height: 30px; - position: relative; - cursor: pointer; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) ); - background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf'); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.checkbox .check-icon { - display: none; - position: absolute; - width: 22px; - height: 22px; - border-radius: 11px; - background-color: #d0f311; - right: -5px; - top: -5px; - box-shadow: 0px 0px 5px rgba(0,0,0,.05); -} -.checkbox .check-icon i { - margin: 1px 0 0 3px; -} -.checkbox .member-name { - line-height: 30px; - padding: 0 10px; -} -img.member-img { - display: inline-block; - float: left; - max-width: 30px; -} -.checked .check-icon { - display: block; -} \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb index 7a7725f4..759e941d 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb @@ -1,11 +1,14 @@ -<%= content_tag :div ,:id => "users_checkbox_ary", do -%> +<%= content_tag :div ,:id => "users_checkbox_ary",:class => 'clear' do -%> <% sys_users = User.all -%> <% sys_users.each do |user| -%>
      -
      + + <% user.sub_roles.each do |sr| %> + + <% end %> + <%= content_tag :div,:data=>{'original-title'=>t('announcement.bulletin.fact_check_setting_window_title'),:content => "#{user.sub_roles.collect{|sr| sr.key}.join(',')}"},:class=>"checkbox clear" do %>
      -
      <% if user.avatar? %> @@ -16,7 +19,7 @@
      <%= label_tag "lab-user-#{user.id}", (user.name rescue ''),:class=>"member-name",:id=>nil -%> <%= check_box_tag "[users][#{user.id}]", 'true',users.include?(user),:class => "check" -%> -
      + <%end -%>
      <% end -%> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb index a4c903c7..38090cf6 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb @@ -2,7 +2,9 @@ <%= stylesheet_link_tag "inc/permission-checkbox" %> <% end %> <% content_for :page_specific_javascript do %> + <%= javascript_include_tag "bootstrap" %> <%= javascript_include_tag "inc/permission-checkbox" %> + <%= javascript_include_tag "inc/search" %> <% end %> <%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %> <%= form_tag('', :remote => true) %> @@ -12,6 +14,7 @@
      <%= label_tag :category, t("announcement.bulletin.category") %> <%= select_tag "category_id", options_from_collection_for_select(@bulletin_categorys, "id", "key") %> + <%= search_field_tag 'user_filter' %>
      @@ -27,6 +30,9 @@
      \n" javascripts << "\n" javascripts << "\n" + javascripts << "\n" javascripts << "\n" javascripts << "\n" page.design.javascripts.each do |js| diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index 31fa6806..2322b62f 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -15,6 +15,7 @@
      • <%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %>
        • +
      • Desktop
      • @@ -25,6 +26,13 @@ <% end %>
      + +
    • + search +
      + +
      +
      • <% if user_signed_in? %>
      • - <%= link_to t('bulletin.status') + content_tag(:b, nil, :class => is_sort?('status')), panel_announcement_back_end_bulletins_path(sortable('status')) %> + <%= link_to t('bulletin.status') + content_tag(:b, nil, :class => is_sort?('status')), panel_announcement_back_end_bulletins_path(sortable('status')), :class => 'js_history' %> - <%= link_to t('bulletin.category') + content_tag(:b, nil, :class => is_sort?('category')), panel_announcement_back_end_bulletins_path(sortable('category')) %> + <%= link_to t('bulletin.category') + content_tag(:b, nil, :class => is_sort?('category')), panel_announcement_back_end_bulletins_path(sortable('category')), :class => 'js_history' %> - <%= link_to t('bulletin.title') + content_tag(:b, nil, :class => is_sort?('title')), panel_announcement_back_end_bulletins_path(sortable('title')) %> + <%= link_to t('bulletin.title') + content_tag(:b, nil, :class => is_sort?('title')), panel_announcement_back_end_bulletins_path(sortable('title')), :class => 'js_history' %> - <%= link_to t('bulletin.start_date') + content_tag(:b, nil, :class => is_sort?('postdate')), panel_announcement_back_end_bulletins_path(sortable('postdate')) %> + <%= link_to t('bulletin.start_date') + content_tag(:b, nil, :class => is_sort?('postdate')), panel_announcement_back_end_bulletins_path(sortable('postdate')), :class => 'js_history' %> - <%= link_to t('bulletin.end_date') + content_tag(:b, nil, :class => is_sort?('deadline')), panel_announcement_back_end_bulletins_path(sortable('deadline')) %> + <%= link_to t('bulletin.end_date') + content_tag(:b, nil, :class => is_sort?('deadline')), panel_announcement_back_end_bulletins_path(sortable('deadline')), :class => 'js_history' %> - <%= link_to t('bulletin.tags') + content_tag(:b, nil, :class => is_sort?('tags')), panel_announcement_back_end_bulletins_path(sortable('tags')) %> + <%= link_to t('bulletin.tags') + content_tag(:b, nil, :class => is_sort?('tags')), panel_announcement_back_end_bulletins_path(sortable('tags')), :class => 'js_history' %> - <%= link_to t('bulletin.last_modified') + content_tag(:b, nil, :class => is_sort?('update_user_id')), panel_announcement_back_end_bulletins_path(sortable('update_user_id')) %> + <%= link_to t('bulletin.last_modified') + content_tag(:b, nil, :class => is_sort?('update_user_id')), panel_announcement_back_end_bulletins_path(sortable('update_user_id')), :class => 'js_history' %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_index.html.erb new file mode 100644 index 00000000..9013cde5 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_index.html.erb @@ -0,0 +1,20 @@ + <%= render 'filter' %> + + <%= render 'bulletins' %> +
      + + <%= paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort]} %> + + + +
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %> +
      + +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "bulletin_form" %> +<% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_header.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_header.html.erb new file mode 100644 index 00000000..c18be27d --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_header.html.erb @@ -0,0 +1,38 @@ + + + + + + + + + + + + + +
      + + + + <%= t('bulletin.status') %> + <%= content_tag(:b, nil, :class => is_sort?('status')) %> + + <%= t('bulletin.category') %> + <%= content_tag(:b, nil, :class => is_sort?('category')) %> + + <%= t('bulletin.title') %> + <%= content_tag(:b, nil, :class => is_sort?('title')) %> + + <%= t('bulletin.start_date') %> + <%= content_tag(:b, nil, :class => is_sort?('postdate')) %> + + <%= t('bulletin.end_date') %> + <%= content_tag(:b, nil, :class => is_sort?('deadline')) %> + + <%= t('bulletin.tags') %> + <%= content_tag(:b, nil, :class => is_sort?('tags')) %> + + <%= t('bulletin.last_modified') %> + <%= content_tag(:b, nil, :class => is_sort?('update_user_id')) %> +
      \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb index 2925f0db..a9f90735 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb @@ -1,26 +1 @@ -<%= render 'filter' %> - - <%= render 'bulletins' %> -
      - -<%= paginate @bulletins %> - - - -
      - -
      - -
      - <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %> -
      - -<% content_for :page_specific_javascript do %> - <%= javascript_include_tag "bulletin_form" %> -<% end %> +<%= render 'index' %> \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb new file mode 100644 index 00000000..f9bc6a8b --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb @@ -0,0 +1,2 @@ +$("#main-wrap").html("<%= j render 'index' %>"); +mainTablePosition(); \ No newline at end of file From c7c3af91dd3bb0d5ac4be5b318ec296789bf2442 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Mon, 9 Apr 2012 12:43:10 +0800 Subject: [PATCH 104/125] add permission-checkbox js --- app/assets/javascripts/inc/permission-checkbox.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/inc/permission-checkbox.js b/app/assets/javascripts/inc/permission-checkbox.js index 78a50759..fc91b857 100644 --- a/app/assets/javascripts/inc/permission-checkbox.js +++ b/app/assets/javascripts/inc/permission-checkbox.js @@ -16,5 +16,4 @@ $(document).ready(function() { placement: 'bottom', delay: { show: 100, hide: 300 }, }); - //$(".checkbox").popover('toggle'); }); \ No newline at end of file From 0eab9ca8faf509eae4c224e2dedd88549a2f5cdd Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Mon, 9 Apr 2012 12:43:51 +0800 Subject: [PATCH 105/125] add pic and js for permission checkbox and filter --- app/assets/images/check.png | Bin 0 -> 1684 bytes app/assets/javascripts/inc/search.js | 31 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 app/assets/images/check.png create mode 100644 app/assets/javascripts/inc/search.js diff --git a/app/assets/images/check.png b/app/assets/images/check.png new file mode 100644 index 0000000000000000000000000000000000000000..e415c89b5e77fc0956ffef4c8a88f218c9b62785 GIT binary patch literal 1684 zcmaJ?YgE%_7_MW2gUR8dfY4zKoubmFsYPgMDW$1WW`!YCoWKZeupKn1X=)3zj5)b_ z*})4=WKNjQsRtB?xTAPE95z7^R5nl%??Z$M6LdP!xfB8SV=U(+-}k+Fp69*hq#%0f z;;D|_jtmB4sv-i3p;vF)J;k1W9*A7hLN7BYc|5g@NTtjui7})aA_W5!dUO>QgQ1#? z)s2{l!LVcLV&kcJUwv)RlsFW?a5DhL(`1Q3@8@px<+!8T^#6l!7PM!zuy1T(5h zoq^I3IABvmQwS3!2I)v&r=T~C%i_k-GSLNtET{p3Ib2&xV?d?y|Dk&QINC_XU~l66 zPhn$hh5>_OFe70i)pX-h{cNrbLK%sn6hX!kMEY12qqPJ@7`21}kSz=3zu{T8 zgrQUl6}XW?aW$qu#2~G~(djfo89xZ&BS?4hOdN}JLM}uH1KC>p zuU3zl==rg2#|M`_jE_Es)ALT!gI#qg_YVEN*eeietmRs*DluZ3lzC=XSBT_tjoVxo zuu!yM-RYk98+Q0+Zp`eJf}nqOd7gj1<3?723SC>Nhv!%K!m5Dl zW+9W)ch|yOVK!;CVF^pNR3Uf%oO<}UyUaMNa&y8T7H5v@dev@LN#rR9g?nyQZGnq& zhFd)8S)Oc-^2$AIwLD|x&YIUPM--e)(c<4(hP98sE@wXdDJ3i4J6Y4*lD9X)1s`O6 z5C42z`?%Rh{$O1&R&=Gn*{&mdkQvb%MsAo>rVsWdbWZjm+}O{jN#@i#=QOAkAAOnA z3Un}@oSnC4$8*YlOX~0>@WhRbu0C;I*;}kvgs+8y``wkjrI?rkM@a${q>VL0BFt0=XYi}ZkbvjMHebj0f{IONAP}M03 z3{1`;Yv%9Y#h$F94t;Xu=-%}aoQ~Niod?ysdZ_j*p6YYIERU=BY`UX0JGe1K;!|YG znVeYE@O0C@eK808Ro!mZEM;2V_G7454gJ0-XBfAW>iNc=DHR_ctc<$h^tSiv zUTMo;?;t$|zHt{2uXZoN@}$n8rmb`RhwfG!y`C*9dQcnWk+v2VJ}>U&c9pK|?tNx| z_14TuEnJt1MSQq zTvdV;KY4U@3t1^Dso1yTVc`#l_}#-= 0; + } +}); +$(document).ready(function(){ + $("#user_filter").keyup(function(){ + if($(this).val()){ + var totalfoundbyname = $("div#users_checkbox_ary label.member-name:containsi("+$(this).val()+")").length + if(totalfoundbyname!=0){ + $("div#users_checkbox_ary label.member-name:not(:containsi("+$(this).val()+"))").parent().parent().slideUp(); + //$("div#users_checkbox_ary label.member-name:not(:containsi("+$(this).val()+"))").parent().popover('hide'); + $("div#users_checkbox_ary label.member-name:containsi("+$(this).val()+")").parent().parent().slideDown(); + $("div#users_checkbox_ary label.member-name:containsi("+$(this).val()+")").parent().popover('toggle'); + }else if(totalfoundbyname==0){ + $("div#users_checkbox_ary div.for_unit:not(:containsi("+$(this).val()+"))").parent().slideUp(); + //$("div#users_checkbox_ary div.for_unit:not(:containsi("+$(this).val()+"))").popover('hide'); + $("div#users_checkbox_ary div.for_unit:containsi("+$(this).val()+")").parent().slideDown(); + $("div#users_checkbox_ary div.for_unit:containsi("+$(this).val()+")").popover('toggle'); + } + }else{ + $(".checkbox").popover('hide'); + $("div.checkblock").slideDown(); + } + }) +}) \ No newline at end of file From d2a3a4d26ea1312f952e4b164d9f8b0efd97c617 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Mon, 9 Apr 2012 12:44:08 +0800 Subject: [PATCH 106/125] ad banner preview --- app/helpers/admin/ad_banner_helper.rb | 24 ++------------- .../admin/ad_banners/_ad_banner_tab.html.erb | 2 +- .../ad_banners/_modal_ad_banner_form.html.erb | 19 ++++++++++-- .../admin/ad_banners/_preview_block.html.erb | 29 +++++++++++++++++++ app/views/admin/ad_banners/index.html.erb | 5 ++-- 5 files changed, 52 insertions(+), 27 deletions(-) create mode 100644 app/views/admin/ad_banners/_preview_block.html.erb diff --git a/app/helpers/admin/ad_banner_helper.rb b/app/helpers/admin/ad_banner_helper.rb index 2de0504b..eff12427 100644 --- a/app/helpers/admin/ad_banner_helper.rb +++ b/app/helpers/admin/ad_banner_helper.rb @@ -1,12 +1,5 @@ module Admin::AdBannerHelper - def preview_block(ad_banner) - res ='' - #same code as in frontend backend parser - if ad_banner - res << "" - res << "
      " + def preview_block_ad_images_helper(ad_banner) printable_ad_images = [] ad_banner.ad_images.each do |ad_image| if ad_image.display? @@ -17,18 +10,7 @@ module Admin::AdBannerHelper end printable_ad_images.shuffle! - printable_ad_images.each do |ad_image| #TODO Need Reflact - res << "" - end - res << "
      " - res.html_safe - end - end + end + end \ No newline at end of file diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index 19ba5087..d9b1b902 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -15,5 +15,5 @@ <%= link_to 'Add AdImage',new_admin_ad_banner_ad_image_path(ad_banner_tab) %>
      <% end -%> - <%= preview_block ad_banner_tab %> + <%= render :partial => 'preview_block',:locals=> {:ad_banner =>ad_banner_tab} %>
      diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb index 418b8c8f..8e8de1d9 100644 --- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb +++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb @@ -1,5 +1,3 @@ - <% end %>
      + diff --git a/app/views/admin/ad_banners/_preview_block.html.erb b/app/views/admin/ad_banners/_preview_block.html.erb new file mode 100644 index 00000000..4e8432b6 --- /dev/null +++ b/app/views/admin/ad_banners/_preview_block.html.erb @@ -0,0 +1,29 @@ +<% if ad_banner -%> +<%= link_to 'Preview',"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %> + + + +<% end -%> + + + diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb index 54d95e00..38b67dd7 100644 --- a/app/views/admin/ad_banners/index.html.erb +++ b/app/views/admin/ad_banners/index.html.erb @@ -1,9 +1,9 @@
        <% @ad_banners.each do |ab| %> - <%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : '' ) %> + <%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : nil ) %> <% end -%> - <%= content_tag :li,link_to('New',"#new-a-banner",:data=>{:toggle=>"tab"}),:class => (@active.nil? ? 'active' : '' ) %> + <%= content_tag :li,link_to('New',"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
      @@ -13,4 +13,3 @@
      - From 486845460c5ff110443a5e7ee745831f333cea4c Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 12 Apr 2012 06:50:36 +0800 Subject: [PATCH 107/125] Filter and delete for bulletins --- app/assets/javascripts/bulletin_form.js.erb | 8 ++ app/helpers/application_helper.rb | 12 +-- .../back_end/bulletins_controller.rb | 80 ++++++++++++++----- .../back_end/bulletins/_bulletin.html.erb | 2 +- .../back_end/bulletins/_bulletins.html.erb | 2 +- .../bulletins/_clear_filters.html.erb | 3 + .../back_end/bulletins/_filter.html.erb | 67 ++-------------- .../bulletins/_filter_categories.html.erb | 6 ++ .../bulletins/_filter_status.html.erb | 7 ++ .../back_end/bulletins/_filter_tags.html.erb | 6 ++ .../back_end/bulletins/_index.html.erb | 20 ----- .../back_end/bulletins/_sort_header.html.erb | 38 --------- .../back_end/bulletins/_sort_headers.html.erb | 31 +++++++ .../back_end/bulletins/index.html.erb | 26 +++++- .../back_end/bulletins/index.js.erb | 9 ++- .../announcement/config/routes.rb | 4 +- 16 files changed, 167 insertions(+), 154 deletions(-) create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_clear_filters.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_status.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_index.html.erb delete mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_header.html.erb create mode 100644 vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb index d20f5081..abb908b4 100644 --- a/app/assets/javascripts/bulletin_form.js.erb +++ b/app/assets/javascripts/bulletin_form.js.erb @@ -17,4 +17,12 @@ $('.quick_edit_cancel').live('click', function(){ $('#' + tr).hide(); $("tr#bulletin_file_" + $(this).prev().attr('value')).hide(); $("tr#bulletin_link_" + $(this).prev().attr('value')).hide(); +}); + +$(document).on('click', '.list-remove', function(){ + $('#delete_bulletins').submit(); +}); + +$(document).on('click', '#check_all_bulletins', function(){ + $('.checkbox_in_list').attr("checked", this.checked); }); \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6d2cf9a8..2f37a517 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -102,18 +102,10 @@ module ApplicationHelper ' web-symbol' if params[:sort].eql?(name) end - def add_filter(param_name, value) - filter = params[:filter] rescue nil - if filter && filter.has_key(param_name) - filter[param_name] << value - elsif filter - filter.merge({param_name => [value]}) - else - {param_name => [value]} - end + def is_filter_active?(type, id) + ' active' if (@filter[type].include?(id.to_s) rescue nil) end - def process_page(page, id) parse_page_noko(page, id) end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb index 3022afe4..e66c51a4 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb @@ -9,11 +9,28 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController get_categorys(params[:bulletin_category_id]) get_tags + @filter = params[:filter] + new_filter = params[:new_filter] + + if @filter && params[:clear] + @filter.delete(params[:type]) + elsif @filter && new_filter + if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) + @filter[new_filter[:type]].delete(new_filter[:id].to_s) + elsif @filter.has_key?(new_filter[:type]) + @filter[new_filter[:type]] << new_filter[:id].to_s + else + @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) + end + elsif new_filter + @filter = {new_filter[:type] => [new_filter[:id].to_s]} + end + # @bulletins = Bulletin.where("bulletin_category_id" => params[:bulletin_category_id]).desc("postdate") if params[:bulletin_category_id] # @bulletins = Bulletin.search(params[:search], params[:category_id]) # @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]]) - @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all.page(params[:page]).per(10) + @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_bulletins : Bulletin.all.page(params[:page]).per(10) @bulletin_categories = BulletinCategory.all @bulletin_link = BulletinLink.new @@ -24,7 +41,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController respond_to do |format| format.html # index.html.erb - format.js + format.js { } format.xml { render :xml => @bulletins } end end @@ -273,6 +290,13 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController get_tags end + def delete + if params[:to_delete] + bulletins = Bulletin.any_in(:_id => params[:to_delete]).delete_all + end + redirect_to panel_announcement_back_end_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort]) + end + protected @@ -290,11 +314,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc) end - def get_sorted_bulletins + def get_sorted_and_filtered_bulletins bulletins = Bulletin.all case params[:sort] when 'postdate', 'deadline' - bulletins.order_by([params[:sort], params[:direction]]).page(params[:page]).per(10) + bulletins = bulletins.order_by([params[:sort], params[:direction]]) when 'category' category_ids = bulletins.distinct(:bulletin_category_id) categories = BulletinCategory.find(category_ids) rescue nil @@ -303,19 +327,15 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController categories.each { |category| h[category.i18n_variable[I18n.locale]] = category.id } sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse! sorted_categorys = sorted.collect {|a| bulletins.where(:bulletin_category_id => a[1]).entries } - sorted_categorys.flatten! - Kaminari.paginate_array(sorted_categorys).page(params[:page]).per(10) - else - nil + bulletins = sorted_categorys.flatten! end when 'title' h = Array.new bulletins.each { |bulletin| h << [bulletin.title[I18n.locale].downcase, bulletin] } sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse! - sorted_titles = sorted.collect {|a| a[1] } - Kaminari.paginate_array(sorted_titles).page(params[:page]).per(10) + bulletins = sorted.collect {|a| a[1] } when 'status' - bulletins.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction]).page(params[:page]).per(10) + bulletins = bulletins.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction]) when 'update_user_id' user_ids = bulletins.distinct(:update_user_id) users = User.find(user_ids) rescue nil @@ -324,10 +344,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController users.each { |user| h << [user.name, user.id] } sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse! sorted_users = sorted.collect {|a| bulletins.where(:update_user_id => a[1]).entries } - sorted_users.flatten! - Kaminari.paginate_array(sorted_users).page(params[:page]).per(10) - else - nil + bulletins = sorted_users.flatten end when 'tags' a = Array.new @@ -339,10 +356,37 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController sorted = params[:direction].eql?('asc') ? tmp.sort : tmp.sort.reverse! sorted_titles = sorted.collect {|a| a[1] } a = params[:direction].eql?('asc') ? (sorted_titles + a) : (a + sorted_titles) - a.flatten! - Kaminari.paginate_array(a).page(params[:page]).per(10) + bulletins = a.flatten end + if @filter + @filter.each do |key, value| + case key + when 'status' + a = Array.new + bulletins.each do |bulletin| + value.each do |v| + a << bulletin if bulletin[v] + end + end + bulletins = a + when 'categories' + a = Array.new + bulletins.each do |bulletin| + a << bulletin if value.include?(bulletin.bulletin_category.id.to_s) + end + bulletins = a + when 'tags' + a = Array.new + bulletins.each do |bulletin| + bulletin.tags.each do |tag| + a << bulletin if value.include?(tag.id.to_s) + end + end + bulletins = a + end if value.size > 0 + end + end + Kaminari.paginate_array(bulletins).page(params[:page]).per(10) end - end diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index 62b28c0c..3abf2fa9 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -1,5 +1,5 @@ - + <%= check_box_tag 'to_delete[]', bulletin.id, false, :class => "checkbox_in_list" %> <% if bulletin.is_top? %> <%= t(:top) %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb index 81daae8b..d5975fbc 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb @@ -10,6 +10,6 @@ - + <%= render :partial => 'bulletin', :collection => @bulletins %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_clear_filters.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_clear_filters.html.erb new file mode 100644 index 00000000..e9c9c481 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_clear_filters.html.erb @@ -0,0 +1,3 @@ +
      + <%= link_to content_tag(:i, nil, :class => 'icons-brush-large') + t(:clear), panel_announcement_back_end_bulletins_path(:filter => @filter, :sort => params[:sort], :direction => params[:direction], :clear => true, :type => type), :class => "btn js_history" %> +
      \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb index ae4cf6ed..b052a770 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb @@ -18,73 +18,16 @@
      -
      - Category1 - Category2 -
      -
      - Clear/蝵 -
      + <%= render 'filter_status' %>
      -
      - <% @bulletin_categories.each do |category| -%> - <%= link_to category.i18n_variable[I18n.locale], panel_announcement_back_end_bulletins_path(:filter => add_filter(:categories, category.id)), :class => 'btn' %> - <% end -%> -
      -
      - Clear/蝵 -
      + <%= render 'filter_categories' %>
      -
      - Tag1 - Tag2 - Tag3 - Tag4 - Tag5 - Tag6 - Tag7 - Tag8 - Tag9 - Tag10 -
      -
      - Clear/蝵 -
      + <%= render 'filter_tags' %>
      -
      - - - - - - - - - - - - - -
      - - - - <%= link_to t('bulletin.status') + content_tag(:b, nil, :class => is_sort?('status')), panel_announcement_back_end_bulletins_path(sortable('status')), :class => 'js_history' %> - - <%= link_to t('bulletin.category') + content_tag(:b, nil, :class => is_sort?('category')), panel_announcement_back_end_bulletins_path(sortable('category')), :class => 'js_history' %> - - <%= link_to t('bulletin.title') + content_tag(:b, nil, :class => is_sort?('title')), panel_announcement_back_end_bulletins_path(sortable('title')), :class => 'js_history' %> - - <%= link_to t('bulletin.start_date') + content_tag(:b, nil, :class => is_sort?('postdate')), panel_announcement_back_end_bulletins_path(sortable('postdate')), :class => 'js_history' %> - - <%= link_to t('bulletin.end_date') + content_tag(:b, nil, :class => is_sort?('deadline')), panel_announcement_back_end_bulletins_path(sortable('deadline')), :class => 'js_history' %> - - <%= link_to t('bulletin.tags') + content_tag(:b, nil, :class => is_sort?('tags')), panel_announcement_back_end_bulletins_path(sortable('tags')), :class => 'js_history' %> - - <%= link_to t('bulletin.last_modified') + content_tag(:b, nil, :class => is_sort?('update_user_id')), panel_announcement_back_end_bulletins_path(sortable('update_user_id')), :class => 'js_history' %> -
      +
      + <%= render 'sort_headers' %>
      \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb new file mode 100644 index 00000000..7ffb08f5 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb @@ -0,0 +1,6 @@ +
      + <% @bulletin_categories.each do |category| -%> + <%= link_to category.i18n_variable[I18n.locale], panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'categories', :id => category.id}, :sort => params[:sort], :direction => params[:direction]), :class => "btn js_history#{is_filter_active?('categories', category.id)}" %> + <% end -%> +
      +<%= render :partial => 'clear_filters', :locals => {:type => 'categories'} %> \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_status.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_status.html.erb new file mode 100644 index 00000000..15a982c1 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_status.html.erb @@ -0,0 +1,7 @@ +
      + <%= link_to t(:is_top), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_top'}, :sort => params[:sort], :direction => params[:direction]), :class => "btn js_history#{is_filter_active?('status', 'is_top')}" %> + <%= link_to t(:is_hot), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hot'}, :sort => params[:sort], :direction => params[:direction]), :class => "btn js_history#{is_filter_active?('status', 'is_hot')}" %> + <%= link_to t(:is_hidden), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hidden'}, :sort => params[:sort], :direction => params[:direction]), :class => "btn js_history#{is_filter_active?('status', 'is_hidden')}" %> + <%= link_to t(:is_checked), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_checked'}, :sort => params[:sort], :direction => params[:direction]), :class => "btn js_history#{is_filter_active?('status', 'is_checked')}" %> +
      +<%= render :partial => 'clear_filters', :locals => {:type => 'status'} %> \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb new file mode 100644 index 00000000..b2f11834 --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb @@ -0,0 +1,6 @@ +
      + <% @tags.each do |tag| -%> + <%= link_to tag[I18n.locale], panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction]), :class => "btn js_history#{is_filter_active?('tags', tag.id)}" %> + <% end -%> +
      +<%= render :partial => 'clear_filters', :locals => {:type => 'tags'} %> \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_index.html.erb deleted file mode 100644 index 9013cde5..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_index.html.erb +++ /dev/null @@ -1,20 +0,0 @@ - <%= render 'filter' %> - - <%= render 'bulletins' %> -
      - - <%= paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort]} %> - - - -
      - <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %> -
      - -<% content_for :page_specific_javascript do %> - <%= javascript_include_tag "bulletin_form" %> -<% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_header.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_header.html.erb deleted file mode 100644 index c18be27d..00000000 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_header.html.erb +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - -
      - - - - <%= t('bulletin.status') %> - <%= content_tag(:b, nil, :class => is_sort?('status')) %> - - <%= t('bulletin.category') %> - <%= content_tag(:b, nil, :class => is_sort?('category')) %> - - <%= t('bulletin.title') %> - <%= content_tag(:b, nil, :class => is_sort?('title')) %> - - <%= t('bulletin.start_date') %> - <%= content_tag(:b, nil, :class => is_sort?('postdate')) %> - - <%= t('bulletin.end_date') %> - <%= content_tag(:b, nil, :class => is_sort?('deadline')) %> - - <%= t('bulletin.tags') %> - <%= content_tag(:b, nil, :class => is_sort?('tags')) %> - - <%= t('bulletin.last_modified') %> - <%= content_tag(:b, nil, :class => is_sort?('update_user_id')) %> -
      \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb new file mode 100644 index 00000000..ee08b45b --- /dev/null +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb @@ -0,0 +1,31 @@ + + + + + + + + + + + + + +
      + + + + <%= link_to t('bulletin.status') + content_tag(:b, nil, :class => is_sort?('status')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('status'))), :class => 'js_history' %> + + <%= link_to t('bulletin.category') + content_tag(:b, nil, :class => is_sort?('category')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('category'))), :class => 'js_history' %> + + <%= link_to t('bulletin.title') + content_tag(:b, nil, :class => is_sort?('title')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('title'))), :class => 'js_history' %> + + <%= link_to t('bulletin.start_date') + content_tag(:b, nil, :class => is_sort?('postdate')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('postdate'))), :class => 'js_history' %> + + <%= link_to t('bulletin.end_date') + content_tag(:b, nil, :class => is_sort?('deadline')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('deadline'))), :class => 'js_history' %> + + <%= link_to t('bulletin.tags') + content_tag(:b, nil, :class => is_sort?('tags')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('tags'))), :class => 'js_history' %> + + <%= link_to t('bulletin.last_modified') + content_tag(:b, nil, :class => is_sort?('update_user_id')), panel_announcement_back_end_bulletins_path({:filter => @filter}.merge(sortable('update_user_id'))), :class => 'js_history' %> +
      \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb index a9f90735..78532f00 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb @@ -1 +1,25 @@ -<%= render 'index' %> \ No newline at end of file +<%= form_for :bulletins, :url => delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil), :html => {:id => 'delete_bulletins'}, :remote => true do %> + <%= render 'filter' %> + + <%= render 'bulletins' %> +
      +<% end %> + +
      + <%= paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
      + + + +
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %> +
      + +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "bulletin_form" %> +<% end %> + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb index f9bc6a8b..292e97bd 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb @@ -1,2 +1,7 @@ -$("#main-wrap").html("<%= j render 'index' %>"); -mainTablePosition(); \ No newline at end of file +$("#collapse-status").html("<%= j render 'filter_status' %>"); +$("#collapse-category").html("<%= j render 'filter_categories' %>"); +$("#collapse-tags").html("<%= j render 'filter_tags' %>"); +$("#delete_bulletins").attr("action", "<%= delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter]) %>"); +$("#sort_headers").html("<%= j render 'sort_headers' %>"); +$("#tbody_bulletins").html("<%= j render :partial => 'bulletin', :collection => @bulletins %>"); +$("#bulletin_pagination").html("<%= j paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>"); \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb index fc1ef4f0..048926cb 100644 --- a/vendor/built_in_modules/announcement/config/routes.rb +++ b/vendor/built_in_modules/announcement/config/routes.rb @@ -6,13 +6,15 @@ Rails.application.routes.draw do match 'fact_check_setting' => "fact_checks#setting" ,:as => :fact_checks_setting match 'update_setting' => "fact_checks#update_setting" ,:as => :fact_checks_update_setting - root :to => "bulletins#index" resources :bulletins do match "link_quick_add/:bulletin_id" => "bulletins#link_quick_add" ,:as => :link_quick_add match "link_quick_edit/:bulletin_id" => "bulletins#link_quick_edit" ,:as => :link_quick_edit member do get 'load_quick_edit' end + collection do + post 'delete' + end match "file_quick_add/:bulletin_id" => "bulletins#file_quick_add" ,:as => :file_quick_add match "file_quick_edit/:bulletin_id" => "bulletins#file_quick_edit" ,:as => :file_quick_edit end From 7bca339a5bdc0c8ae237f61b3e5264c714e623e2 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 12 Apr 2012 07:01:34 +0800 Subject: [PATCH 108/125] Ray's fix for columns width in bulletins --- app/assets/stylesheets/bootstrap-orbit.css | 8 ++++++++ .../announcement/back_end/bulletins/_bulletins.html.erb | 2 +- .../announcement/back_end/bulletins/_filter.html.erb | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/bootstrap-orbit.css b/app/assets/stylesheets/bootstrap-orbit.css index eede71d4..34425d50 100644 --- a/app/assets/stylesheets/bootstrap-orbit.css +++ b/app/assets/stylesheets/bootstrap-orbit.css @@ -102,6 +102,14 @@ table .span1-2 { float: none; margin-left: 0; } +table .span1-3 { + min-width: 200px; + float: none; + margin-left: 0; +} .qe-block .form-horizontal .form-actions { text-align:right; +} +.modal.fade { + top: -50%; } \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb index 81daae8b..cdda48fe 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb @@ -7,7 +7,7 @@ - + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb index f8ea5418..55a5c2b9 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb @@ -79,7 +79,7 @@ <%= link_to t('bulletin.tags') + content_tag(:b, nil, :class => is_sort?('tags')), panel_announcement_back_end_bulletins_path(sortable('tags')) %> - + <%= link_to t('bulletin.last_modified') + content_tag(:b, nil, :class => is_sort?('update_user_id')), panel_announcement_back_end_bulletins_path(sortable('update_user_id')) %> From 1fd38c81359c36adb733e4319a61983759de5712 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 5 Apr 2012 18:27:23 +0800 Subject: [PATCH 109/125] factcheck status for and --- .../announcement/app/models/bulletin.rb | 11 +++++++++++ .../back_end/bulletins/_bulletin.html.erb | 1 + .../announcement/config/locales/zh_tw.yml | 1 + 3 files changed, 13 insertions(+) diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index e24f7f21..4808b3a9 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -79,6 +79,17 @@ class Bulletin end + def status + case self.is_checked + when nil + I18n.t('announcement.bulletin.fact_check_pending') + when true + I18n.t('announcement.bulletin.fact_check_pass') + when false + I18n.t('announcement.bulletin.fact_check_not_pass') + end + end + def is_expired? Date.today > self.deadline ? true : false rescue false #some dates might sat as nil so rescue false diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index 3abf2fa9..ca80512e 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -10,6 +10,7 @@ <% if bulletin.is_hidden? %> <%= t(:hidden) %> <% end %> + <%= bulletin.status %> <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %> diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml index e2dfd957..bee4b04e 100644 --- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml @@ -33,6 +33,7 @@ zh_tw: fact_check: 砍撖拇 fact_check_setting: 撖拇貉身摰 fact_check_stat: 撖拇貊瘜 + fact_check_pending: 撖拇訾葉 fact_check_not_pass: '銝' fact_check_pass: '' fact_check_not_pass_reason: '銝' From 0909156eb40a83efb9804bf5f7c373c1a7be51f3 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Thu, 5 Apr 2012 18:30:45 +0800 Subject: [PATCH 110/125] fix i18n var for fact check pending --- vendor/built_in_modules/announcement/config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml index 6143b177..b21546f8 100644 --- a/vendor/built_in_modules/announcement/config/locales/en.yml +++ b/vendor/built_in_modules/announcement/config/locales/en.yml @@ -40,6 +40,7 @@ en: fact_check_stat: Fact Check Status fact_check_not_pass: 'Not Pass' fact_check_not_pass_reason: 'Reason' + fact_check_pending: 'Pending' fact_check_pass: 'Pass' # admin: # action: Action From e4c41ab54c280ea14692d48e015dd7dfe8a7c22e Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 6 Apr 2012 17:46:50 +0800 Subject: [PATCH 111/125] A filter UI for permission select. with Harry's JS --- .../javascripts/inc/permission-checkbox.js | 12 +++-- .../stylesheets/inc/permission-checkbox.css | 53 ------------------- .../fact_checks/_privilege_user.html.erb | 11 ++-- .../back_end/fact_checks/setting.html.erb | 6 +++ .../announcement/config/locales/en.yml | 2 + .../announcement/config/locales/zh_tw.yml | 2 +- 6 files changed, 25 insertions(+), 61 deletions(-) delete mode 100644 app/assets/stylesheets/inc/permission-checkbox.css diff --git a/app/assets/javascripts/inc/permission-checkbox.js b/app/assets/javascripts/inc/permission-checkbox.js index e314d2aa..78a50759 100644 --- a/app/assets/javascripts/inc/permission-checkbox.js +++ b/app/assets/javascripts/inc/permission-checkbox.js @@ -1,14 +1,20 @@ $(document).ready(function() { - $('.check[checked="checked"]').parents(".checkbox").addClass("checked"); + $('.check[checked="checked"]').parents(".checkbox").addClass("checked") $(".checkbox").click(function(){ if($(this).children(".check").attr("checked")){ // uncheck - $(this).children(".check").attr('checked', false); - $(this).removeClass("checked"); + $(this).children(".check").attr('checked', false); + $(this).removeClass("checked"); }else{ // check $(this).children(".check").attr({checked: "checked"}); $(this).addClass("checked"); } }); + $(".checkbox").popover({ + trigger: 'hover', + placement: 'bottom', + delay: { show: 100, hide: 300 }, + }); + //$(".checkbox").popover('toggle'); }); \ No newline at end of file diff --git a/app/assets/stylesheets/inc/permission-checkbox.css b/app/assets/stylesheets/inc/permission-checkbox.css deleted file mode 100644 index 9d7beb5e..00000000 --- a/app/assets/stylesheets/inc/permission-checkbox.css +++ /dev/null @@ -1,53 +0,0 @@ -.checkblock { - display: inline-block; - float: left; - width: 200px; -} -.check[type="checkbox"]{ - display:none; -} -.checkbox{ - padding:5px; - margin:5px; - display: inline-block; - color:#777777; - text-shadow: 0 1px 0px rgba(255,255,255,.4); - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - height: 30px; - position: relative; - cursor: pointer; - background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) ); - background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% ); - filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf'); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.checkbox .check-icon { - display: none; - position: absolute; - width: 22px; - height: 22px; - border-radius: 11px; - background-color: #d0f311; - right: -5px; - top: -5px; - box-shadow: 0px 0px 5px rgba(0,0,0,.05); -} -.checkbox .check-icon i { - margin: 1px 0 0 3px; -} -.checkbox .member-name { - line-height: 30px; - padding: 0 10px; -} -img.member-img { - display: inline-block; - float: left; - max-width: 30px; -} -.checked .check-icon { - display: block; -} \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb index 7a7725f4..759e941d 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb @@ -1,11 +1,14 @@ -<%= content_tag :div ,:id => "users_checkbox_ary", do -%> +<%= content_tag :div ,:id => "users_checkbox_ary",:class => 'clear' do -%> <% sys_users = User.all -%> <% sys_users.each do |user| -%>
      -
      + + <% user.sub_roles.each do |sr| %> + + <% end %> + <%= content_tag :div,:data=>{'original-title'=>t('announcement.bulletin.fact_check_setting_window_title'),:content => "#{user.sub_roles.collect{|sr| sr.key}.join(',')}"},:class=>"checkbox clear" do %>
      -
      <% if user.avatar? %> @@ -16,7 +19,7 @@
      <%= label_tag "lab-user-#{user.id}", (user.name rescue ''),:class=>"member-name",:id=>nil -%> <%= check_box_tag "[users][#{user.id}]", 'true',users.include?(user),:class => "check" -%> -
      + <%end -%>
      <% end -%> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb index cf5cf13c..7303b705 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb @@ -2,7 +2,9 @@ <%= stylesheet_link_tag "inc/permission-checkbox" %> <% end %> <% content_for :page_specific_javascript do %> + <%= javascript_include_tag "bootstrap" %> <%= javascript_include_tag "inc/permission-checkbox" %> + <%= javascript_include_tag "inc/search" %> <% end %> <%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %> <%= form_tag('', :remote => true) %> @@ -12,6 +14,7 @@
      <%= label_tag :category, t("announcement.bulletin.category") %> <%= select_tag "category_id", options_from_collection_for_select(@bulletin_categorys, "id", "key") %> + <%= search_field_tag 'user_filter' %>
      @@ -27,6 +30,9 @@
      " - res << "
      " + def preview_block_ad_images_helper(ad_banner) printable_ad_images = [] ad_banner.ad_images.each do |ad_image| if ad_image.display? @@ -17,18 +10,7 @@ module Admin::AdBannerHelper end printable_ad_images.shuffle! - printable_ad_images.each do |ad_image| #TODO Need Reflact - res << "" - end - res << "
      " - res.html_safe - end - end + end + end \ No newline at end of file diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index 19ba5087..d9b1b902 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -15,5 +15,5 @@ <%= link_to 'Add AdImage',new_admin_ad_banner_ad_image_path(ad_banner_tab) %>
      <% end -%> - <%= preview_block ad_banner_tab %> + <%= render :partial => 'preview_block',:locals=> {:ad_banner =>ad_banner_tab} %>
      diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb index 418b8c8f..8e8de1d9 100644 --- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb +++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb @@ -1,5 +1,3 @@ - <% end %>
      + diff --git a/app/views/admin/ad_banners/_preview_block.html.erb b/app/views/admin/ad_banners/_preview_block.html.erb new file mode 100644 index 00000000..4e8432b6 --- /dev/null +++ b/app/views/admin/ad_banners/_preview_block.html.erb @@ -0,0 +1,29 @@ +<% if ad_banner -%> +<%= link_to 'Preview',"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %> + + + +<% end -%> + + + diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb index 54d95e00..38b67dd7 100644 --- a/app/views/admin/ad_banners/index.html.erb +++ b/app/views/admin/ad_banners/index.html.erb @@ -1,9 +1,9 @@
        <% @ad_banners.each do |ab| %> - <%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : '' ) %> + <%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : nil ) %> <% end -%> - <%= content_tag :li,link_to('New',"#new-a-banner",:data=>{:toggle=>"tab"}),:class => (@active.nil? ? 'active' : '' ) %> + <%= content_tag :li,link_to('New',"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
      @@ -13,4 +13,3 @@
      - From 93ac99d23573dbada55e0dc215d706d08c466eb7 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 12 Apr 2012 18:12:46 +0800 Subject: [PATCH 115/125] Add missing css in "inc" --- .../stylesheets/inc/permission-checkbox.css | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 app/assets/stylesheets/inc/permission-checkbox.css diff --git a/app/assets/stylesheets/inc/permission-checkbox.css b/app/assets/stylesheets/inc/permission-checkbox.css new file mode 100644 index 00000000..0adf7225 --- /dev/null +++ b/app/assets/stylesheets/inc/permission-checkbox.css @@ -0,0 +1,77 @@ +.checkblock { + display: inline-block; + float: left; + width: 200px; +} +.check[type="checkbox"]{ + display:none; +} +.checkbox{ + padding: 5px; + margin: 5px 5px 10px; + display: inline-block; + color:#777777; + text-shadow: 0 1px 0px rgba(255,255,255,.4); + border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + height: 30px; + position: relative; + cursor: pointer; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) ); + background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf'); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); +} +.checkbox .check-icon { + display: none; + position: absolute; + width: 26px; + height: 26px; + background: url('img/check.png') no-repeat left top; + right: -10px; + top: -5px; +} +.checkbox .member-name { + cursor: pointer; + font-family: helvetica; + font-size: 12px; + line-height: 30px; + padding: 0 10px 0 40px; + color: #333333; + display: inline-block; + margin-bottom: 0; +} +.member-avatar { + position: absolute; + width: 34px; + height: 34px; + overflow: hidden; + margin-top: -2px; +} +img.member-img { + max-width: 100%; +} +.checked .check-icon { + display: block; +} +.popover-inner { + width: auto; + display: inline-block; + text-align: center; +} +.popover-title { + display: block; + font-size: 12px; + font-weight: normal; + padding: 3px 10px; +} +.popover-content { + padding: 3px 10px; + color: #898989; +} +.popover-content p { + font-size: 12px; +} \ No newline at end of file From 015c0cb4524f93e2982dc7cc50d34c13c13c0e09 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 12 Apr 2012 18:13:10 +0800 Subject: [PATCH 116/125] Delete useless code in items --- app/views/layouts/_drop_down_menu.html.erb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app/views/layouts/_drop_down_menu.html.erb b/app/views/layouts/_drop_down_menu.html.erb index 900437a6..89285ebb 100644 --- a/app/views/layouts/_drop_down_menu.html.erb +++ b/app/views/layouts/_drop_down_menu.html.erb @@ -7,18 +7,4 @@
    • <%= link_to t('admin.member'), admin_users_path, :class => 'orblink' %>
    • <%= link_to t('admin.translation'), admin_translations_path, :class => 'orblink' %>
    • <%= link_to t('admin.site'), admin_sites_path, :class => 'orblink' %>
      • - - \ No newline at end of file From 167f6d07a0cc6496523c6920fe69bf0687d8115e Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 12 Apr 2012 18:13:26 +0800 Subject: [PATCH 117/125] Remove extra "]" --- .../views/panel/announcement/back_end/bulletins/index.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb index 292e97bd..24e36542 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb @@ -1,7 +1,7 @@ $("#collapse-status").html("<%= j render 'filter_status' %>"); $("#collapse-category").html("<%= j render 'filter_categories' %>"); $("#collapse-tags").html("<%= j render 'filter_tags' %>"); -$("#delete_bulletins").attr("action", "<%= delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter]) %>"); +$("#delete_bulletins").attr("action", "<%= delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter) %>"); $("#sort_headers").html("<%= j render 'sort_headers' %>"); $("#tbody_bulletins").html("<%= j render :partial => 'bulletin', :collection => @bulletins %>"); $("#bulletin_pagination").html("<%= j paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>"); \ No newline at end of file From 6728c35023bff21f6d7e7cc858997777ef46e0ec Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 12 Apr 2012 18:14:00 +0800 Subject: [PATCH 118/125] Fix side_bar. In the case of tags, take the uri instead of controller name --- app/helpers/application_helper.rb | 2 +- app/views/layouts/_side_bar.html.erb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2f37a517..e45fa4d6 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -83,7 +83,7 @@ module ApplicationHelper end def active_for_action(controller_name, action_name) - (controller.controller_name.eql?(controller_name) && controller.action_name.eql?(action_name)) ? 'active' : nil + ((controller.controller_name.eql?(controller_name) || request.fullpath.eql?(controller_name)) && controller.action_name.eql?(action_name)) ? 'active' : nil end def sortable(column) diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 3a36a48a..f74f24f6 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -2,14 +2,14 @@ <%= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %> <% end -%> -<%= content_tag :li, :class => active_for_controllers('bulletins', 'tags', 'bulletin_categorys') do -%> +<%= content_tag :li, :class => active_for_controllers('bulletins', 'tags', 'bulletin_categorys', 'fact_checks') do -%> <%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %> - <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', 'tags', 'bulletin_categorys')) do -%> + <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', 'tags', 'bulletin_categorys', 'fact_checks')) do -%> <%= content_tag :li, link_to(t('admin.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %> <%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %> <%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %> - <%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %> - <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('bulletins', 'fact_check_setting') if (is_manager? rescue nil) %> + <%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('panel/bulletin/back_end/tags', 'index') %> + <%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('fact_checks', 'setting') if (is_manager? rescue nil) %> <% end -%> <% end -%> @@ -44,7 +44,7 @@ <%= content_tag :li, link_to(t('admin.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_link', 'index') %> <%= content_tag :li, link_to(t('admin.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %> <%= content_tag :li, link_to(t('admin.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %> - <%= content_tag :li, link_to(t('admin.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('tags', 'index') %> + <%= content_tag :li, link_to(t('admin.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('panel/web_resource/back_end/tags', 'index') %> <% end -%> <% end -%> From f8873267a2a185dd13fe46fabb288b674e3c82c2 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 12 Apr 2012 18:41:14 +0800 Subject: [PATCH 119/125] Ray's fix for announcement list --- app/assets/javascripts/orbit-1.0.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js index e83c69f6..5f69b297 100644 --- a/app/assets/javascripts/orbit-1.0.js +++ b/app/assets/javascripts/orbit-1.0.js @@ -51,7 +51,7 @@ $(document).ready(function(){ $('#main-sidebar').css("height", viewportheight-30); $('#main-sidebar .viewport').css("height", viewportheight-30); $('.post-title').css("width", viewportwidth-495); - $('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft) + $('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft); $('#main-sidebar').tinyscrollbar(); $('.detal-list').tinyscrollbar(); $('#main-sidebar').tinyscrollbar({size:(viewportheight-34)}); @@ -72,14 +72,14 @@ $(window).resize(function(){ $('#main-sidebar').css("height", viewportheight-30); $('#main-sidebar .viewport').css("height", viewportheight-30); $('.post-title').css("width", viewportwidth-495); - $('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft) + $('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft) $('#main-sidebar').tinyscrollbar({size:(viewportheight-34)}); mainTablePosition(); }); /*main-table position*/ function mainTablePosition() { var $height = $('#main-wrap .subnav').length && $('#main-wrap .subnav').height(); - var $table = $('#main-wrap > table').length && $('#main-wrap > table'); + var $table = $('.main-list').length && $('.main-list:last'); if($table && $table==0){ $table.css({marginTop:$height}); } From fe59446c16c383a9a5730eae66c277ccdedfe15f Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 13 Apr 2012 12:47:57 +0800 Subject: [PATCH 120/125] fix date selector value fill back problem --- app/views/admin/ad_images/_form.html.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index d595b1e7..c04246a8 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -32,13 +32,15 @@ today = today.format('isoDate'); var state = false; var arr = state ? "" : "" + var start_date = <%= "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'"%> || today + var end_date = <%= "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'"%> || today //calendarRange - $('#calendarRange .showDate').html(today+" - "+today) - $('#calendarRange .calendarInput').val(today+" - "+today); + $('#calendarRange .showDate').html(start_date+" - "+end_date) + $('#calendarRange .calendarInput').val(start_date+" - "+end_date); $('#calendarRange #widgetCalendar').DatePicker({ flat: true, format: 'Y / m / d', - date: today, + date: [start_date,end_date], calendars: 1, mode: 'range', starts: 1, From de035cb89a34d29fecf0f7b2bcaa64de781d6b31 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 13 Apr 2012 12:47:57 +0800 Subject: [PATCH 121/125] fix date selector value fill back problem --- app/views/admin/ad_images/_form.html.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index d595b1e7..c04246a8 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -32,13 +32,15 @@ today = today.format('isoDate'); var state = false; var arr = state ? "" : "" + var start_date = <%= "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'"%> || today + var end_date = <%= "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'"%> || today //calendarRange - $('#calendarRange .showDate').html(today+" - "+today) - $('#calendarRange .calendarInput').val(today+" - "+today); + $('#calendarRange .showDate').html(start_date+" - "+end_date) + $('#calendarRange .calendarInput').val(start_date+" - "+end_date); $('#calendarRange #widgetCalendar').DatePicker({ flat: true, format: 'Y / m / d', - date: today, + date: [start_date,end_date], calendars: 1, mode: 'range', starts: 1, From d646a9dff1802070ee04349d97b77b3ae672a06b Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 13 Apr 2012 15:24:59 +0800 Subject: [PATCH 122/125] fix new ad_image data selector bug --- app/views/admin/ad_images/_form.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index c04246a8..1089db3b 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -32,10 +32,10 @@ today = today.format('isoDate'); var state = false; var arr = state ? "" : "" - var start_date = <%= "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'"%> || today - var end_date = <%= "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'"%> || today + var start_date = <%= @ad_image.post_date.nil?? 'today' : "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'" %>; + var end_date = <%= @ad_image.unpost_date.nil?? 'today' : "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'" %>; //calendarRange - $('#calendarRange .showDate').html(start_date+" - "+end_date) + $('#calendarRange .showDate').html(start_date+" - "+end_date); $('#calendarRange .calendarInput').val(start_date+" - "+end_date); $('#calendarRange #widgetCalendar').DatePicker({ flat: true, From ca0fc4c767bce96d249cc1f96156512f419d85a2 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Fri, 13 Apr 2012 15:53:25 +0800 Subject: [PATCH 123/125] Comment out code that bugged upload image in ad_banner --- app/assets/javascripts/side_bar_history.js | 42 +++++++++---------- .../ad_banners/_ad_image_update.html.erb | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/side_bar_history.js b/app/assets/javascripts/side_bar_history.js index e9505aa1..4b5da1d4 100644 --- a/app/assets/javascripts/side_bar_history.js +++ b/app/assets/javascripts/side_bar_history.js @@ -1,28 +1,28 @@ var history_edited = false; -$('#back_sidebar a, #back_main a.nav').live('click', - function () { - $.getScript(this.href); - history.pushState(null, document.title, this.href); - history_edited = true; - return false; - } -); +// $('#back_sidebar a, #back_main a.nav').live('click', +// function () { +// $.getScript(this.href); +// history.pushState(null, document.title, this.href); +// history_edited = true; +// return false; +// } +// ); -$('#back_main a.reload').live('click', - function () { - $.getScript(this.href); - history.replaceState(null, document.title, this.href); - history_edited = true; - return false; - } -); +// $('#back_main a.reload').live('click', +// function () { +// $.getScript(this.href); +// history.replaceState(null, document.title, this.href); +// history_edited = true; +// return false; +// } +// ); -$('.form').live('submit', function () { - $.post(this.action, $(this).serialize(), null, 'script'); - history_edited = true; - return false; -}); +// $('.form').live('submit', function () { +// $.post(this.action, $(this).serialize(), null, 'script'); +// history_edited = true; +// return false; +// }); $(document).on('click', '.js_history', function () { diff --git a/app/views/admin/ad_banners/_ad_image_update.html.erb b/app/views/admin/ad_banners/_ad_image_update.html.erb index 366d370d..b2dfdc73 100644 --- a/app/views/admin/ad_banners/_ad_image_update.html.erb +++ b/app/views/admin/ad_banners/_ad_image_update.html.erb @@ -1,5 +1,5 @@
    • - <%= image_tag ad_image.file %> + <%= image_tag ad_image.file rescue nil %>

      <%= ad_image.display? ? '[Showing]' : '[NotShawing]' %> <%= "#{ad_image.post_date ||'NeedReset' }~#{ad_image.unpost_date || 'NeedReset'}" %> From 0fe5baf93f449b55db16b827cb730f95d612c52d Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 13 Apr 2012 16:14:43 +0800 Subject: [PATCH 124/125] fix for letting ad_banner display even when file in not uploaded --- app/assets/stylesheets/widget.css | 2 +- app/views/admin/ad_banners/_ad_image_update.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/widget.css b/app/assets/stylesheets/widget.css index f1c4d615..7a658f36 100644 --- a/app/assets/stylesheets/widget.css +++ b/app/assets/stylesheets/widget.css @@ -58,7 +58,7 @@ cursor: pointer; } .select-role { - display:none; + display:none; padding: 10px 0; } .file-upload { diff --git a/app/views/admin/ad_banners/_ad_image_update.html.erb b/app/views/admin/ad_banners/_ad_image_update.html.erb index 366d370d..b87e5684 100644 --- a/app/views/admin/ad_banners/_ad_image_update.html.erb +++ b/app/views/admin/ad_banners/_ad_image_update.html.erb @@ -1,5 +1,5 @@

    • - <%= image_tag ad_image.file %> + <%= image_tag ad_image.file rescue nil%>

      <%= ad_image.display? ? '[Showing]' : '[NotShawing]' %> <%= "#{ad_image.post_date ||'NeedReset' }~#{ad_image.unpost_date || 'NeedReset'}" %> From 4af73ecf6fcee27a5b44a35d8829c5d862f62ce0 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 13 Apr 2012 16:46:16 +0800 Subject: [PATCH 125/125] fix preview window size. --- app/assets/stylesheets/admin/ad_banner_preview.css.erb | 4 ++++ app/views/admin/ad_banners/_preview_block.html.erb | 2 +- app/views/admin/ad_banners/index.html.erb | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/admin/ad_banner_preview.css.erb diff --git a/app/assets/stylesheets/admin/ad_banner_preview.css.erb b/app/assets/stylesheets/admin/ad_banner_preview.css.erb new file mode 100644 index 00000000..f46be689 --- /dev/null +++ b/app/assets/stylesheets/admin/ad_banner_preview.css.erb @@ -0,0 +1,4 @@ +.banner-preview { + width: auto; + left: 35%; +} \ No newline at end of file diff --git a/app/views/admin/ad_banners/_preview_block.html.erb b/app/views/admin/ad_banners/_preview_block.html.erb index 4e8432b6..c2185d04 100644 --- a/app/views/admin/ad_banners/_preview_block.html.erb +++ b/app/views/admin/ad_banners/_preview_block.html.erb @@ -1,7 +1,7 @@ <% if ad_banner -%> <%= link_to 'Preview',"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %> -