Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Replaced protoype with jquery. Some fixes in mailer class.

Browse source
This commit is contained in:
benni 2011-05-11 15:14:39 +02:00
parent bdb177dfa6
commit 2a72263bd3
28 changed files with 21207 additions and 10398 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/views/layouts/application.haml
View file

@ -8,7 +8,7 @@
<!--[if lte IE 7]>
= stylesheet_link_tag 'ie_hacks'
<![endif]-->
= javascript_include_tag 'prototype', 'effects', 'controls', 'application', 'ordering', :cache => "all_cached"
= javascript_include_tag 'jquery.min', 'jquery-ui.min', 'jquery_ujs', 'application', 'ordering', :cache => "all_cached"
= yield(:head)
%body
#logininfo= render :partial => 'shared/loginInfo'
@ -22,17 +22,10 @@
#main
#content
- if flash[:notice]
%h3.notice#flashNotice= flash[:notice]
- if flash[:error]
%h3.error#flashError= flash[:error]
- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash#{name.to_s.camelize}", :class => "flash #{name}"
#loader{:style => "display:none;"}= image_tag("loader.gif", :border => 0)
- if show_title?
%h1= yield(:title)
= yield
#ajax_box(style="display:none")
- if flash[:notice]
= javascript_tag("new Effect.Highlight('flashNotice', {delay:0.8, duration:1});")
- if flash[:error]
= javascript_tag("new Effect.Highlight('flashError', {delay:0.8, duration:1});")

14
app/views/layouts/application.html.erb
View file

@ -1,14 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>Foodsoft</title>
<%= stylesheet_link_tag :all %>
<%= javascript_include_tag :defaults %>
<%= csrf_meta_tag %>
</head>
<body>
<%= yield %>
</body>
</html>