Revert "First parts of new 'web-app-theme'." This is fun stuff and should be managed in another branch.

This reverts commit c04819e8c4.

app/views/layouts/_main_tabnav.html.erb

@@ -57,15 +57,15 @@
 <ul>
   <% for tab in tabs -%>
     <% unless tab[:access_denied?] -%>
-      <li class="<%= 'active' if tab_is_active?(tab) %>">
+      <li class="<%= 'current' if tab_is_active?(tab) %>">
         <%= link_to tab[:name], tab[:url] %>
-        <!--<ul>
+        <ul>
           <% for subtab in tab[:subnav] -%>
             <% unless subtab[:access_denied?] -%>
               <li><%= link_to subtab[:name], subtab[:url] %></li>
             <% end -%>
           <% end -%>
-        </ul>-->
+        </ul>
       </li>
     <% end -%>
   <% end -%>

app/views/layouts/application.haml

@@ -3,40 +3,35 @@
   %head
     %meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
     %title= "FoodSoft - " + (yield(:title) or controller.controller_name)
-    = stylesheet_link_tag 'base'
-    = stylesheet_link_tag 'style'
+    = 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
-    #container
-      #header
-        %h1
-          %a{:href => "/"}= APP_CONFIG[:name]
-        #user-navigation
-          = render :partial => 'shared/loginInfo'
-          .clear
-        #main-navigation
-          = render :partial => 'layouts/main_tabnav'
-          .clear
-      #wrapper
-        #loader{:style => "display:none;"}
-          = image_tag("loader.gif", :border => 0)
-        #main
-          - if flash[:notice]
-            .flash-messages.notice
-              %p= flash[:notice]
-          - if flash[:error]
-            .flash-messages.error
-              %p= flash[:error]
-          = yield
-        #sidebar
-          = yield(:sidebar)
-        .clear
-      #footer
-        .block
-          %p= "#{APP_CONFIG[:name]} is powered by FoodSoft"
-    - if flash[:notice] or flash[:error]
-      = javascript_tag("new Effect.Highlight('flash-messages', {delay:0.8, duration:1});")
+    #logininfo= render :partial => 'shared/loginInfo'
+    
+    #header
+      #logo
+        %a{:href => "/"}
+          <span>food</span>soft
+        %span{:style => "color:white; font-size:45%; letter-spacing: -1px;"}= APP_CONFIG[:name]
+      #nav= render :partial => 'layouts/main_tabnav'
+
+    #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});")