From 01132e3dc026a246470e858eeaf05630636c7782 Mon Sep 17 00:00:00 2001 From: maxwell Date: Thu, 1 Jul 2010 09:02:38 -0700 Subject: [PATCH] pushing js changes --- app/views/layouts/application.html.haml | 2 +- app/views/layouts/session_wall.html.haml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 0f604ef70..e18d81b32 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -11,7 +11,7 @@ = stylesheet_link_tag "application" /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" = javascript_include_tag 'jquery142', 'rails', 'view', 'publisher' - = javascript_include_tag 'tiny_mce/tiny_mce.js','jquery.infieldlabel' + = javascript_include_tag 'jquery.infieldlabel' = render 'js/google_a_js' = render 'js/websocket_js' diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml index 3838ba0d2..f80d09afb 100644 --- a/app/views/layouts/session_wall.html.haml +++ b/app/views/layouts/session_wall.html.haml @@ -23,8 +23,9 @@ welcome back, %span = User.first.real_name.downcase + = yield -else %div#huge_text - you need to add a user first! + %span + you need to add a user first! - = yield