Initial commit of foodsoft 2

app/views/layouts/application.haml

@@ -0,0 +1,37 @@
+!!!
+%html
+  %head
+    %meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
+    %title= "FoodSoft - " + (yield(:title) or controller.controller_name)
+    = stylesheet_link_tag 'foodsoft'
+    = stylesheet_link_tag "print", :media => "print"
+    = javascript_include_tag 'prototype'
+    = javascript_include_tag 'effects'
+    = javascript_include_tag 'controls'
+    = javascript_include_tag 'application'
+    = javascript_include_tag('ordering') if (controller.controller_name == "ordering")
+  %body
+    #logininfo= render :partial => 'shared/loginInfo'
+    
+    #header
+      #logo
+        %a{:href => "/"}
+          <span>food</span>soft
+        %span{:style => "color:white; font-size:45%; letter-spacing: -1px;"}= FoodSoft::getFoodcoopName
+      #nav= render :partial => 'shared/nav'
+
+    #main
+      #content
+        - if flash[:notice]
+          %h3.notice#flashNotice= flash[:notice]
+        - if flash[:error]
+          %h3.error#flashError= flash[:error]
+        #loader{:style => "display:none;"}= image_tag("loader.gif", :border => 0)
+        - if yield(:title)
+          %h1= yield(:title)
+        = yield
+
+    - 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});")

app/views/layouts/login.haml

@@ -0,0 +1,15 @@
+!!!
+%html
+  %head
+    %meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
+    %title= "FoodSoft - " + (yield(:title) or controller.controller_name)
+    = stylesheet_link_tag 'foodsoft'
+    = javascript_include_tag 'prototype'    
+  %body
+    #login
+      - if yield(:title)
+        %h1= yield(:title)
+      = yield
+      #meta
+        Foodcoop 
+        = link_to_if FoodSoft::getFoodcoopUrl, FoodSoft::getFoodcoopName, FoodSoft::getFoodcoopUrl