diff options
| -rw-r--r-- | app/views/layouts/default.rhtml | 16 | ||||
| -rw-r--r-- | app/views/layouts/no_chrome.rhtml | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 6551095c2..cee98711e 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -32,9 +32,10 @@ <style type="text/css">@import url("/stylesheets/ie7.css");</style> <![endif]--> <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> - <!-- XXX: add conditional include --> + <% if force_registration_on_new_request %> <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet" %> - + <% end %> + <% if @feed_autodetect %> <% for feed in @feed_autodetect %> <link rel="alternate" type="application/atom+xml" title="<%=h feed[:title] %>" href="<%=h feed[:url]%>"> @@ -62,8 +63,8 @@ $(document).ready(function() { $("#make-request-link").fancybox({ 'modal': false, - 'width': 800, - 'height': 500, + 'width': 900, + 'height': 400, 'type': 'iframe', 'href': '/en/profile/sign_in?modal=1', 'onClosed': function() { @@ -132,9 +133,7 @@ </div> </div> <div id="wrapper"> - <div id="content"> - <% if flash[:notice] %> <div id="notice"><%= flash[:notice] %></div> <% end %> @@ -143,9 +142,8 @@ <% end %> <div id="<%= controller.controller_name + "_" + controller.action_name %>" class="controller_<%= controller.controller_name %>"> - - <div id="other-country-notice"></div> - <%= yield :layout %> + <div id="other-country-notice"></div> + <%= yield :layout %> </div> </div> </div> diff --git a/app/views/layouts/no_chrome.rhtml b/app/views/layouts/no_chrome.rhtml index c314dfbd3..74c79b701 100644 --- a/app/views/layouts/no_chrome.rhtml +++ b/app/views/layouts/no_chrome.rhtml @@ -11,7 +11,9 @@ <script type="text/javascript" src="/javascripts/jquery.js"></script> - <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'main', :title => "Main", :rel => "stylesheet" %> + <%= stylesheet_link_tag 'fonts', :rel => "stylesheet" %> + <%= stylesheet_link_tag 'theme', :rel => "stylesheet" %> <!--[if LT IE 7]> <style type="text/css">@import url("/stylesheets/ie6.css");</style> <![endif]--> @@ -21,7 +23,7 @@ <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> </head> <body> - <div class="entirebody"> + <div class="entirebody"> <div id="content"> <% if flash[:notice] %> <div id="notice"><%= flash[:notice] %></div> |