From 88057aef08884c4d4637fab39e814a8ea62ea7a6 Mon Sep 17 00:00:00 2001 From: AurelioAHeckert Date: Fri, 2 May 2008 16:29:21 +0000 Subject: [PATCH] ActionItem360: Zen3 footer formated --- app/views/layouts/application.rhtml | 21 ++++++++++----------- public/designs/themes/ecosol/stylesheets/common.css | 102 ------------------------------------------------------------------------------------------------------ public/designs/themes/zen3/stylesheets/common.css | 47 ++++++++++++++++++++++++++++++++++++++++++++++- public/stylesheets/controller_cms.css | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/stylesheets/controller_profile_editor.css | 41 +++++++++++++++++++++++++++++++++++++++++ public/stylesheets/lightbox.css | 1 + 6 files changed, 162 insertions(+), 114 deletions(-) diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index feac27c..3cdae6b 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -9,6 +9,16 @@ + + <%= javascript_include_tag 'default-config' %> + <%= javascript_include_tag :defaults %> + <%# javascript_include_tag 'animator' %> + <%= javascript_include_tag 'menu' %> + <%= javascript_include_tag 'auto-open-menu' %> + <%= include_lightbox_header %> + <%= javascript_include_tag 'cms' if @controller.controller_name == 'cms' %> + <%= theme_javascript %> + <%# stylesheet_import is better then stylesheet_link_tag because the stylesheet must be loaded before the page show. @@ -33,17 +43,6 @@ <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %> <%= stylesheet_link_tag '/designs/icons/default/style.css' %> - <%= javascript_include_tag 'default-config' %> - <%= javascript_include_tag :defaults %> - <%# javascript_include_tag 'animator' %> - <%= javascript_include_tag 'menu' %> - <%= javascript_include_tag 'auto-open-menu' %> - <%= include_lightbox_header %> - <%# cms stuff %> - <% if @controller.controller_name == 'cms' %> - <%= javascript_include_tag 'cms' %> - <% end %> - <%= theme_javascript %>