Flow upgrades

2013-02-17 10:13:14 +01:00
parent 4fd4fa3a85
commit 43073e10f8
4 changed files with 23 additions and 22 deletions
@@ -41,6 +41,14 @@ html lang="en"
          .content-top
          .main-inner
            #wsite-content.wsite-not-footer
+              - if flash[:alert].present?
+                .alert.alert-error
+                  a.close data-dismiss="alert" &#215;
+                  div= flash[:alert]
+              - if flash[:notice].present?
+                .alert.alert-success
+                  a.close data-dismiss="alert" &#215;
+                  div= flash[:notice]
              = yield :page_title
              = yield
      #footer-wrap
@@ -50,15 +58,4 @@ html lang="en"
          = render 'footer'
          .bottom
            | &copy; Qwaiter 2012
-            
-      
-      .content
-        - if flash[:alert].present?
-          .alert.alert-error
-            a.close data-dismiss="alert" &#215;
-            div= flash[:alert]
-        - if flash[:notice].present?
-          .alert.alert-success
-            a.close data-dismiss="alert" &#215;
-            div= flash[:notice]
    = javascript_include_tag "theme1/application"
@@ -9,6 +9,6 @@
 - content_for :footer do
  javascript:
    $(function(){
-      Quser.watch_events();
      Quser.home_loader();
+      Quser.watch_events();
    });