Fixed admin, orders, wiki views. Converted all erb to haml.

2012-10-15 21:19:17 +02:00 · 2012-10-15 21:19:17 +02:00 · 552c553b77
commit 552c553b77
parent 699fb9b233
169 changed files with 1158 additions and 1307 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -15,9 +15,9 @@
  .container-fluid
    .row-fluid
      - if content_for?(:sidebar)
-        .span2
+        .span3
          = yield(:sidebar)
-        .span10
+        .span9
          = bootstrap_flash
          - if show_title?
            .page-header
@ -33,3 +33,4 @@
    %footer
      %p
        Foodsoft, open source software to manage a non-profit food coop.
+  #modalContainer
--- a/app/views/layouts/email.text.erb
+++ b/app/views/layouts/email.text.erb
@ -1,6 +0,0 @@
-<%= yield %>
-
--
-FoodSoft: <%= root_url %>
-Foodcoop-Homepage: <%= FoodsoftConfig[:homepage] %>
-Hilfe/Help: <%= FoodsoftConfig[:help_url] %>
--- a/app/views/layouts/email.text.haml
+++ b/app/views/layouts/email.text.haml
@ -0,0 +1,5 @@
+= yield
+\--
+FoodSoft: #{root_url}
+Foodcoop-Homepage: #{FoodsoftConfig[:homepage]}
+Hilfe/Help: #{FoodsoftConfig[:help_url]}