Integration of Ray' modifications

This commit is contained in:
chris2tof committed 2011-11-17 20:02:58 +08:00
1 parent c4810274ec
commit 861237d65b
39 files changed
+804 -175

No files matched your search

@@ -0,0 +1,10 @@
<ul id="orblist">
<li><%= link_to t('homepage'), root_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.item'), admin_items_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.design'), admin_designs_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.purchase'), admin_purchases_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.asset'), admin_assets_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.member'), admin_users_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.translation'), admin_translations_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.site'), admin_sites_path, :class => 'orblink' %></li>
</ul>
+43 -53
View File
@@ -1,67 +1,57 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>R4</title>
<link rel="shortcut icon" href="/favicon.ico">
<%= yield :page_specific_link %>
<%= stylesheet_link_tag "admin", :media => "screen, projection" %>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application" %>
<%= yield :page_specific_css %>
<%= csrf_meta_tag %>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>R4</title>
<link rel="shortcut icon" href="/favicon.ico">
<%= yield :page_specific_link %>
<%= stylesheet_link_tag "admin", :media => "screen, projection" %>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application" %>
<%= yield :page_specific_css %>
<%= csrf_meta_tag %>
</head>
<body>
<div id="panel_banner_link" >
<div id="orbit">
<ul id="orblist">
<li><%= link_to t('homepage'), root_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.item'), admin_items_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.design'), admin_designs_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.purchase'), admin_purchases_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.asset'), admin_assets_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.user_info'), admin_user_info_models_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.user_role'), admin_user_role_models_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.translation'), admin_translations_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.site'), admin_sites_path, :class => 'orblink' %></li>
</ul>
</div>
<div class="hmenu">
<div class="lang">
<%= render 'layouts/lang_menu' %>
<div id="panel_banner_link" >
<div id="orbit">
<%= render 'layouts/drop_down_menu' %>
</div>
<div class="hmenu">
<div class="lang">
<%= render 'layouts/lang_menu' %>
</div>
<%= render 'devise/menu/login_items' %>
</div>
<%= render 'devise/menu/login_items' %>
</div>
</div>
<div id="panel_container">
</div>
<div id="panel_container">
<div id="panel_content">
<div class="secondary">
<div class="secondary2">
<%= yield :secondary %>
<div id="panel_content">
<div class="secondary">
<div class="secondary2">
<%= yield :secondary %>
</div>
</div>
<div class="main">
<div class="main2">
<%= yield %>
</div>
</div>
<div class="tertiary"><%= yield :tertiary %></div>
</div>
<div id="panel_footer">
<p>Rulingcom</p>
</div>
</div>
<div class="main">
<div class="main2">
<%= yield %>
</div>
</div>
<div class="tertiary"><%= yield :tertiary %></div>
</div>
<div id="panel_footer">
<p>Rulingcom</p>
</div>
</div>
<%= yield :page_specific_javascript %>
<%= yield :page_specific_javascript %>
</body>
</html>
+2 -12
View File
@@ -23,18 +23,8 @@
<div id="panel_banner_link" >
<div id="orbit">
<ul id="orblist">
<li><%= link_to t('homepage'), root_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.item'), admin_items_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.design'), admin_designs_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.purchase'), admin_purchases_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.asset'), admin_assets_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.user_info'), admin_user_info_models_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.user_role'), admin_user_role_models_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.translation'), admin_translations_path, :class => 'orblink' %></li>
<li><%= link_to t('admin.site'), admin_sites_path, :class => 'orblink' %></li>
</ul>
<div id="orbit">
<%= render 'layouts/drop_down_menu' %>
</div>
<div class="hmenu">
+46
View File
@@ -0,0 +1,46 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>R4</title>
<link rel="shortcut icon" href="/favicon.ico">
<%= yield :page_specific_link %>
<%= stylesheet_link_tag 'admin', "member", 'messy', :media => "screen, projection" %>
<%#= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application" %>
<%= yield :page_specific_css %>
<%= csrf_meta_tag %>
</head>
<body>
<div id="content">
<div id="hmenu">
<div id="orbit">
<%= render 'layouts/drop_down_menu' %>
</div>
<div class="hmenu">
<div class="lang">
<%= render 'layouts/lang_menu' %>
</div>
<%= render 'devise/menu/login_items' %>
</div>
</div>
<div id="sidebar">
<div id="search">
<input id="user_search" name="user[username]" size="30" type="text" />
</div>
<%= yield :secondary %>
</div>
<div id="main">
<div class="main_list">
<%= yield %>
</div>
</div>
<%= yield :page_specific_javascript %>
</body>
</html>