application.slim in cmstyle-0.0.14

- old
+ new
@@ -1,35 +1,44 @@
 doctype html
 html lang="en"
   head
-    meta charset="utf-8"
     title #{APPLICATION_NAME}
-    meta name="viewport" content="width=device-width initial-scale=1.0"
+    meta charset="utf-8"
+    meta name="viewport" content="width=device-width, initial-scale=1.0"
     meta name="description" content="Compound Management Web Application"
     meta name="author" content="Compound Management"
 
+    = stylesheet_link_tag "bootstrap", :media => "all"
+    style
+      | body {padding-top: 60px;}
+    = stylesheet_link_tag "bootstrap-responsive", :media => "all"
     = stylesheet_link_tag "application", :media => "all"
 
     /!-- HTML5 shim, for IE6-8 support of HTML5 elements
     /[if lt IE 9]
       = javascript_include_tag "html5.js"
 
     = csrf_meta_tags
-  body
-	= render :partial => 'layouts/header'
-    
-    div class="container-fluid"
-       div class="row-fluid"
-       	div class="span12"
-       		/! main content
-       		== yield
-	   		br
-								
-    = render :partial => 'layouts/footer'
-    
-	= render :partial => 'layouts/modals'
 
-	
+    /! Fav and touch icons
+    link rel="shortcut icon" href="#{image_path('cm_app.ico')}"
+    link rel="apple-touch-icon" href="#{image_path('cm_app.png')}"
+body 
+  /! Navigation Bar
+  == yield :navigation
 
+  /! Main content
+  div class="container-fluid"
+    div class="row-fluid"
+      div class="span12"
+        /! Flash messages
+        - flash.each do |type, msg|
+          div class="alert alert-#{type.to_s}"
+            = msg
+        /! content
+        == yield 
 
-    /! For fast page loads
-    = javascript_include_tag "application"
+  /! Footer
+  = render :partial => 'layouts/footer'       
+
+  /! For fast page loads
+  = javascript_include_tag "application"
\ No newline at end of file