From 98b93583df7777daef4ee850d75ada0464f51e70 Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Mon, 20 Aug 2007 19:20:45 +0000 Subject: [PATCH] ActionItem0: integrating comatose with the design --- app/views/comatose_admin | 1 - app/views/layouts/application.rhtml | 64 ++++++++++++++++++---------------------------------------------- public/javascripts/comatose_admin.js | 1 - public/stylesheets/comatose_admin.css | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------- 4 files changed, 130 insertions(+), 97 deletions(-) delete mode 120000 app/views/comatose_admin delete mode 120000 public/javascripts/comatose_admin.js diff --git a/app/views/comatose_admin b/app/views/comatose_admin deleted file mode 120000 index c13d7cf..0000000 --- a/app/views/comatose_admin +++ /dev/null @@ -1 +0,0 @@ -../../vendor/plugins/comatose/views/comatose_admin \ No newline at end of file diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 20d35ae..b205a2b 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -1,56 +1,28 @@ - + + + + Comatose Admin + <%= stylesheet_link_tag 'comatose_admin' %> <%= javascript_include_tag :defaults %> - <%= stylesheet_link_tag 'common' %> - <%= design_all_header_tags %> <%= javascript_include_tag 'comatose_admin' %> - <% if params[:controller] == 'comatose_admin' %> - <%= stylesheet_link_tag 'comatose_admin' %> - <% end %> - - - <%= image_tag 'loading.gif', :id => 'spinner', :style => "display:none; float:right;" %> -
-
- - - - - <% unless flash[:notice].nil? %> -
- <%= flash[:notice] %> -
- <% end %> - -
- -
- -
- <% if params[:controller] == 'comatose_admin' %> - <%= yield %> - <% else %> - <%= design_display(yield) %> - <% end %> -
- -