Items UI changes

This commit is contained in:
chris2tof committed 2011-06-10 13:57:42 +08:00
1 parent 247b8ec4dc
commit a695b9ad29
31 files changed
+141 -41

No files matched your search

+9 -11
View File
@@ -5,8 +5,7 @@
<title><%= @title || 'R4 rescue title' %></title>
<link rel="shortcut icon" href="/favicon.ico">
<%= yield :page_specific_link %>
<%= stylesheet_link_tag "easy", "main", "devise", "content", :media => "screen, projection" %>
<%= stylesheet_link_tag "easyprint", :media => "print" %>
<%= stylesheet_link_tag "content", :media => "screen, projection" %>
<%= javascript_include_tag :ckeditor %>
<%= javascript_include_tag "jquery", "jquery-ui", "rails", "easy", "application", :cache => 'all' %>
@@ -18,8 +17,8 @@
<%= csrf_meta_tag %>
</head>
<body>
<div id="header">
<ul id="nav">
<div id="panel_header">
<ul id="panel_nav">
<li><%= link_to t('homepage'), root_path %></li>
<li><%= link_to t('admin.item'), admin_items_path %></li>
<li><%= link_to t('admin.layout'), admin_layouts_path %></li>
@@ -28,7 +27,7 @@
<li><%= link_to t('admin.user_role'), admin_user_role_models_path %></li>
<li><%= link_to t('admin.translation'), admin_translations_path %></li>
</ul>
<ul class="hmenu">
<ul class="panel_hmenu">
<li>
<%= render 'layouts/lang_menu' %>
</li>
@@ -36,12 +35,11 @@
</ul>
</div>
<div id="content" class="content">
<div id="sidebar" style='float: left;'><%= yield :sidebar %></div>
<div id="main" style='float: left;'><%= yield %></div>
<div id="panel_content" class="content">
<div id="panel_sidebar" style='float: left;'><%= yield :sidebar %></div>
<div id="panel_main" style='float: left;'><%= yield %></div>
</div>
<div id="footer">
</div>
<div id="panel_footer"><%= yield :footer %></div>
</body>
</html>
</html>