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

Upgraded to rails 3.1.8. Fixed various bugs in wiki.

Browse source
This commit is contained in:
benni 2012-09-30 21:15:55 +02:00
parent cd91436f7f
commit 29a6cd8b62
106 changed files with 430 additions and 22436 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/layouts/application.haml → app/views/layouts/application.html.haml
View file

@ -3,15 +3,13 @@
%head
%meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
%title= "FoodSoft - " + (yield(:title) or controller.controller_name)
= stylesheet_link_tag 'main', 'rails_messages', 'nav', 'simple_form', 'token-input', 'jquery.fancybox-1.3.4',
:cache => "all_cached"
= stylesheet_link_tag 'application'
= stylesheet_link_tag "print", :media => "print"
<!--[if lte IE 7]>
= stylesheet_link_tag 'ie_hacks'
<![endif]-->
= javascript_include_tag 'jquery.min', 'jquery-ui.min', 'jquery_ujs', 'jquery.tokeninput', 'jquery.observe_field',
'rails.validations', 'application', 'ordering', 'jquery.fancybox-1.3.4.pack', :cache => 'all_cached'
= csrf_meta_tag
= javascript_include_tag 'application'
= csrf_meta_tags
= yield(:head)
%body
#logininfo= render :partial => 'shared/loginInfo'

5
app/views/layouts/login.haml → app/views/layouts/login.html.haml
View file

@ -3,8 +3,9 @@
%head
%meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
%title= "FoodSoft - " + (yield(:title) or controller.controller_name)
= stylesheet_link_tag 'main', 'rails_messages', 'nav', 'simple_form', :cache => "login_cached"
= javascript_include_tag 'jquery.min'
= stylesheet_link_tag 'application'
= javascript_include_tag 'application'
= csrf_meta_tags
= yield(:head)
%body
#login