Merge HTML head section

This commit is contained in:
Eric Davis 2011-03-05 19:00:14 -08:00
parent 74cfd7b5ca
commit 1f57eb01b1
1 changed files with 15 additions and 6 deletions

View File

@ -9,17 +9,26 @@
<%= favicon %>
<%= stylesheet_link_tag 'application', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= stylesheet_link_tag 'redmine-reset', :media => 'all' %>
<%= stylesheet_link_tag 'reset', :media => 'all' %>
<%= stylesheet_link_tag 'main', :media => 'all' %>
<%= stylesheet_link_tag 'thickbox', :media => 'all' %>
<!--[if lte IE 6]><%= stylesheet_link_tag 'ie6', :media => 'all' %><![endif]-->
<!--[if lte IE 7]><%= stylesheet_link_tag 'ie7', :media => 'all' %><![endif]-->
<!--[if gte IE 8]><![endif]-->
<%= javascript_heads %>
<%= stylesheet_link_tag 'jstoolbar' %>
<%= javascript_include_tag 'jquery.1.3.2.min.js' %>
<%= javascript_include_tag 'jquery.hoverIntent.minified.js' %>
<%= javascript_include_tag 'thickbox.min.js' %>
<%= javascript_include_tag 'common.js' %>
<%= heads_for_theme %>
<!--[if IE 6]>
<style type="text/css">
* html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
</style>
<![endif]-->
<%= heads_for_wiki_formatter %>
<%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags -->
<%= yield :header_tags -%>
<%= javascript_include_tag 'jquery.menu_expand.js' %>
</head>
<body class="<%=h body_css_classes %>">
<div id="wrapper">