From 194773f064c166b27dd8fd6eaeec5a7b58667ba3 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Fri, 14 Sep 2012 02:27:49 +0800 Subject: [PATCH] Fix bugs after merge --- Gemfile | 3 +-- app/assets/stylesheets/desktop.css | 1 + app/views/layouts/_side_bar.html.erb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d1fc0c5d..9beaa4f1 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,6 @@ gem 'exception_notification' # Send error trace gem 'execjs' gem 'jquery-rails' gem 'jquery-ui-rails' -gem "pry", "~> 0.9.10" gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git' # gem "memcached", "~> 1.4.3" @@ -27,7 +26,7 @@ gem 'nokogiri' gem 'radius' gem 'rake' # gem 'remotipart' -gem 'resque' # background jobs +gem 'resque', :require => 'resque/server' # background jobs gem 'resque-scheduler' # job scheduling gem 'resque-restriction' #gem 'rb-readline' diff --git a/app/assets/stylesheets/desktop.css b/app/assets/stylesheets/desktop.css index 4ec8f89d..226afb8f 100644 --- a/app/assets/stylesheets/desktop.css +++ b/app/assets/stylesheets/desktop.css @@ -10,4 +10,5 @@ *= require desktopmain *= require desktopmedia *= require orbitTimeline + *= require orbit-bar */ \ 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 cabdc0d9..0ff28bde 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -107,12 +107,12 @@ <% end -%> <%= content_tag :li, :class => active_for_controllers('cals','calendar_categories') || active_for_app_auth("calendar") do -%> - <%= link_to content_tag(:i, nil, :class => 'icons-calendar') + t('admin.calendar'), panel_calendar_back_end_cals_path %> + <%#= link_to content_tag(:i, nil, :class => 'icons-calendar') + t('admin.calendar'), panel_calendar_back_end_cals_path %> <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('cals','calendar_categories') ) 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_images', 'new') %> - <%= content_tag :li, link_to(t('calendar.calendars'), panel_calendar_back_end_calendar_categories_path), :class => active_for_action('calendar_categories','index') %> + <%#= content_tag :li, link_to(t('calendar.calendars'), panel_calendar_back_end_calendar_categories_path), :class => active_for_action('calendar_categories','index') %> <%#= content_tag :li, link_to(t('gallery.tags'), panel_gallery_back_end_tags_path), :class => active_for_action('/panel/gallery/back_end/tags', 'index') %> <%#= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "gallery"}))), :class => active_for_app_auth('gallery') if (is_admin? rescue nil) %> <% end -%>