application.html.haml in elabs-5.0.0

- old
+ new

@@ -1,11 +1,14 @@
 !!!
 %html{ lang: locale }
   %head
     %meta{ content: 'text/html; charset=UTF-8', 'http-equiv': 'Content-Type' }/
-    %title= page_title(@page_title)
+    %meta{ name: 'viewport',
+           content: 'width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' }
+    %meta{ 'http-equiv': 'X-UA-Compatible', content: 'ie=edge' }
     = csrf_meta_tags
+    %title= page_title(@page_title)
     = stylesheet_link_tag    'application', media: 'all'
     = javascript_include_tag 'application'
     = auto_discovery_link_tag :rss, albums_url(format: :rss, show_nsfw: show_nsfw?)
     = auto_discovery_link_tag :rss, articles_url(format: :rss, show_nsfw: show_nsfw?)
     = auto_discovery_link_tag :rss, notes_url(format: :rss, show_nsfw: show_nsfw?)
@@ -14,32 +17,40 @@
   %body.page#top
     %noscript
       = _('Javascript seems to be disabled.')
     = render 'elabs/layouts/menu'
 
-    - if @page_title # This variable should be set in views (or controllers)
-      %h1.page__title= @page_title
+    .page__wrapper
 
-    .page__actions
-      = render "elabs/#{controller_name}/filters" if render_filters?
-      %a.btn--report{ href: '#', onclick: 'openModal(event, "report-modal")' }
-        %i.fa.fa-flag
-        = _('Report this page')
+      = render 'elabs/layouts/announcements'
 
-    .page__content
-      .page__content__container
-        = yield
+      .page__header
 
+        - if @page_title # This variable should be set in views (or controllers)
+          %h1.page__header__title= @page_title
+
+        - if render_filters?
+          .page__header__actions
+            %a.page__header__actions_button{ href: '#' }
+              = icon 'filter', ['fw']
+            = render "elabs/#{controller_name}/filters"
+
+      = render 'elabs/layouts/flash_messages'
+
+      .page__content
+        .page__content__container
+          = yield
+
     .modal#report-modal
       .modal__overlay{ onclick: 'closeModal("report-modal")' }
       .modal__window
         .modal__window__title
           %h1= _('Report this page')
           .modal__close-button
             %i.fa.fa-times{ onclick: 'closeModal("report-modal")' }
         .modal__window__content
           = render 'elabs/reports/form', new_report: @new_report
 
-    = render 'elabs/layouts/footer'
+    = render 'elabs/layouts/footer', can_report: true
 
   -# Widget templates
-  = render 'elabs/layouts/widgets/vue/all_widgets'
+  = render 'elabs/layouts/shortcodes/widgets/vue/all_widgets'