app/views/layouts/top.rhtml in parlement-0.13 vs app/views/layouts/top.rhtml in parlement-0.14

- old
+ new

@@ -1,33 +1,54 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> - <META name="verify-v1" content="5f3d3AgFwXPbIg9jJA/vBU8lZEz8m/F9InWWVNeJWMU=" /> - <META name="verify-v1" content="GQG8JPKekfUN1haTZYQRLP+PvKkH43Rg2HQ53OTLgTg=" /> + <meta name="verify-v1" content="5f3d3AgFwXPbIg9jJA/vBU8lZEz8m/F9InWWVNeJWMU=" /> + <meta name="verify-v1" content="GQG8JPKekfUN1haTZYQRLP+PvKkH43Rg2HQ53OTLgTg=" /> <!-- For www.echarp.org --> - <META name="verify-v1" content="GQG8JPKekfUN1haTZYQRLP+PvKkH43Rg2HQ53OTLgTg=" /> + <meta name="verify-v1" content="GQG8JPKekfUN1haTZYQRLP+PvKkH43Rg2HQ53OTLgTg=" /> <!-- echarp.dyndns.org --> - <META name="verify-v1" content="6espv1bly2noRX0tNze9x9In903DuzgvEzmAQdDw250=" /> + <meta name="verify-v1" content="6espv1bly2noRX0tNze9x9In903DuzgvEzmAQdDw250=" /> <title><%= @title %></title> - <link rel="alternate" type="application/rss+xml" title="Latest Posts - <%= @title %>" + <link rel="alternate" type="application/rss+xml" title="<%= _('Latest posts') %> - <%= @title %>" href="<%= url_for :action => 'rss', :id => @elt %>"/> - <link rel="alternate" type="application/rss+xml" title="Highest posts - <%= @title %>" + <link rel="alternate" type="application/rss+xml" title="<%= _('Highest posts') %> - <%= @title %>" href="<%= url_for :action => 'vote_rss', :id => @elt %>"/> - <%= stylesheet_link_tag 'default.css' %> + <%= stylesheet_link_tag 'default' %> + <%= stylesheet_link_tag 'blue', :title => 'blue', :rel => 'alternate stylesheet' %> <%= javascript_include_tag "/javascripts/prototype" %> <%= javascript_include_tag "/javascripts/scriptaculous" %> + <%= javascript_include_tag "/javascripts/shadedborder" %> <%= javascript_include_tag "/javascripts/behaviour" %> <%= javascript_include_tag "/javascripts/mybehaviour" %> <!-- compliance patch for microsoft browsers --> + <script type="text/javascript"> + var displayBorder = true; + </script> <!--[if lt IE 7]> - <script type="text/javascript">IE7_PNG_SUFFIX = ".png";</script> + <style type="text/css"> + body { background: white; } + #sidebar { background: #ddf; } + /* Crazy, without that, the "test" or "blog" elements kill ie6 */ + a.knobOpened { position: relative !important; } + ul.top li.elt { + width: auto; !important; + background: none !important; } + ul.top h1 a, ul.top h2 a { + border-right: white; + border-left: white; } + ul.top li.elt { background: none; } + </style> + <script type="text/javascript"> + displayBorder = false; + //IE7_PNG_SUFFIX = "architecture.png"; + </script> <%= javascript_include_tag "/javascripts/ie7.js" %> <![endif]--> <link rel="shortcut icon" href="/images/world.png" type="image/png"/> @@ -35,29 +56,26 @@ <meta name="author" content="Emmanuel Charpentier"/> <meta name="subject" content="Parlement, democratic mailing list and forum"/> <meta name="robots" content="index, follow"/> <meta name="keywords" content="collaborative writing, democracy, direct democracy, representative democracy, forum, mailing list, chat, delegable proxy, Ruby on Rails, PostgreSQL"/> - <META NAME="DC.title" CONTENT="Parlement" LANG="en"/> - <META NAME="DC.title" CONTENT="Parlement" LANG="fr"/> + <meta name="DC.title" content="Parlement" lang="en"/> + <meta name="DC.title" content="Parlement" lang="fr"/> <meta name="DC.description" content="Parlement, a mix between direct and representative democracy, in the shape of a website. A mailing list, forum, chat. Democratic mailing list and forum"/> - <META NAME="DC.subject" CONTENT="Parlement, democratic mailing list and forum"/> + <meta name="DC.subject" content="Parlement, democratic mailing list and forum"/> <meta name="DC.keywords" content="collaborative writing, democracy, direct democracy, representative democracy, forum, mailing list, chat, delegable proxy, Ruby on Rails, PostgreSQL"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + + <script type="text/javascript"> + if (displayBorder) { + var border = RUZEE.ShadedBorder.create({ corner: 8, shadow: 16, border: 2 }); + } + </script> </head> - <body> - <div class="links"> - <a class="title" href="http://leparlement.org">Parlement</a> - <span class="signets"> - <a href="/people"><%= _('people') %></a> - <a href="http://rubyforge.org/projects/parlement">forge</a> - <a href="http://www.gnu.org/licenses/gpl.html">GPL</a> - <a id="fr" href="/fr">fr</a> - </span> - </div> - + <body id="body" class="<%= session[:person] ? "logged" : "anon" %> sb"> + <script type="text/javascript">if (displayBorder) { border.render('body'); }</script> <%= @content_for_layout %> <p class="version"> <a href="<%= url_for :controller => 'elt', :action => 'show', :id => '' %>"> v<%= PARLEMENT_VERSION %></a>