app/views/layouts/application.html.erb in mitamirri-0.13.8 vs app/views/layouts/application.html.erb in mitamirri-2.0.8

- old
+ new

@@ -1,20 +1,53 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <title><%= yield(:title) -%></title> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> + <meta name="description" content="<%= yield(:meta_description) -%>" /> + <meta name="keywords" content="<%= yield(:meta_keywords) -%>" /> + <link rel="canonical" href="<%= request.url -%>" /> + <link rel="shortcut icon" href="/favicon.ico" /> + <link href="/stylesheets/core.css" media="all" rel="stylesheet" type="text/css" /> + <link href="/stylesheets/application.css" media="all" rel="stylesheet" type="text/css" /> + <link href="/stylesheets/mitamirri.css" media="all" rel="stylesheet" type="text/css" /> + <link href="/stylesheets/mitamirri_print.css" media="print" rel="stylesheet" type="text/css" /> + <!--[if IE]> + <%= stylesheet_link_tag 'core_ie', :media => :all -%> + <![endif]--> + <%= javascript_include_tag :defaults %> + <%= csrf_meta_tag %> + </head> + <body> + <div id="container"> + <div id="header"> + <div id="branding"></div> + <div id="navigation"> + <%= breadcrumbs -%> + </div> + </div> + <div id="page_header"> + <h1><%= yield(:page_title) -%></h1> + </div> + <div id="content_area"> + <div id="washout" style="display:none;"></div> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <meta http-equiv="content-type" content="text/html;charset=UTF-8" /> - <title>Mitamirri: <%= yield :title -%></title> - <%= stylesheet_link_tag 'mitamirri' %> - <%= Seer::init_visualization -%> -</head> -<body> - -<p style="color: green"><%= flash[:notice] %></p> - -<%= yield %> - -<p class="footer">Generated by <a href="http://github.com/Bantik/mitamirri/">Mitamirri</a> by <a href="http://www.idolhands.com/">Corey Ehmke</a> / <a href="http://www.seologic.com/">SEOLogic</a>.</p> - -</body> + <%- flash.each do |name, msg| -%> + <%- if name == :notice -%> + <%= content_tag :div, msg, :id => "flash_#{name}", :class => "flash_#{name}", :style => "display:none;" -%> + <script type="text/javascript"> + $('washout').toggle(); + $('flash_notice').toggle(); + <%= visual_effect(:fade, 'flash_notice', :duration => 1.0, :delay => 1.0).html_safe -%> + <%= visual_effect(:fade, 'washout', :duration => 1.0, :delay => 1.0).html_safe -%> + </script> + <%- else -%> + <%= content_tag :div, msg, :id => "flash_#{name}", :class => "flash_#{name}" -%> + <%- end -%> + <%- end -%> + <%= yield -%> + <br style="clear: both;" /> + </div> + <div id="footer"><p>&copy; <%= Time.zone.now.year -%> SEO Logic. All rights reserved.</p></div> + </div> + </body> </html>