pushing js changes

This commit is contained in:
maxwell 2010-07-01 09:02:38 -07:00
parent 4153b7f387
commit 01132e3dc0
2 changed files with 4 additions and 3 deletions

View file

@ -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'

View file

@ -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