From 9c6c622a49e444979d0f12419eee219ffeee5b0e Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 3 Dec 2012 22:31:00 +0800 Subject: [PATCH] Add missing icons and css for icons in layout --- app/assets/stylesheets/desktop.css | 1 + app/assets/stylesheets/site_editor.css.erb | 1 + app/helpers/admin/items_helper.rb | 2 +- app/views/layouts/_orbit_bar.html.erb | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/desktop.css b/app/assets/stylesheets/desktop.css index 48c2ee6a..3150f23c 100644 --- a/app/assets/stylesheets/desktop.css +++ b/app/assets/stylesheets/desktop.css @@ -12,4 +12,5 @@ *= require desktopmedia *= require orbitTimeline *= require orbit-bar + *= require icons */ \ No newline at end of file diff --git a/app/assets/stylesheets/site_editor.css.erb b/app/assets/stylesheets/site_editor.css.erb index 6506589e..5f571af4 100644 --- a/app/assets/stylesheets/site_editor.css.erb +++ b/app/assets/stylesheets/site_editor.css.erb @@ -13,4 +13,5 @@ *= require scroll_style *= require site_items *= require sidebar + *= require icons */ \ No newline at end of file diff --git a/app/helpers/admin/items_helper.rb b/app/helpers/admin/items_helper.rb index 2f46b15f..6763cff2 100644 --- a/app/helpers/admin/items_helper.rb +++ b/app/helpers/admin/items_helper.rb @@ -12,7 +12,7 @@ module Admin::ItemsHelper end ret << "
  • " # ret << "" - ret << "
    " + ret << "
    " ret << (link_to node.title, dest, :class => 'js_history') ret << "
    " ret << (link_to t(:edit), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page') diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index 6e498480..252af34c 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -54,7 +54,7 @@
  • <% else %>