developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ika's changes

Browse Source
This commit is contained in:
chris2tof committed 2011-08-25 08:07:18 +08:00
1 parent 118455aa81
commit 4cd9854706
15 files changed
+484 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/devise/menu/_login_items.html.erb
+6 -6
View File
@@ -1,9 +1,9 @@
<% if user_signed_in? %>
<li>
<%= link_to('Logout', destroy_user_session_path) %>
</li>
<div id="log_out">
<%= link_to('Logout', destroy_user_session_path) %>
</div>
<% else %>
<li>
<%= link_to('Login', new_user_session_path) %>
</li>
<div id="log_in">
<%= link_to('Login', new_user_session_path) %>
</div>
<% end %>
app/views/layouts/admin.html.erb
+9 -8
View File
@@ -12,16 +12,17 @@
<%= csrf_meta_tag %>
</head>
<body>
<div id="container">
<div id="banner_link" style='text-align:right'>
<ul class="hmenu">
<li>
<%= render 'layouts/lang_menu' %>
</li>
<%= render 'devise/menu/login_items' %>
</ul>
<div id="banner_link" >
<div class="hmenu">
<div class="lang">
<%= render 'layouts/lang_menu' %>
</div>
<%= render 'devise/menu/login_items' %>
</div>
</div>
<div id="container">
<div id="header">
<h1>RulingSite <%= t('admin.admin') %></h1>
app/views/layouts/content.html.erb
+21 -12
View File
@@ -20,8 +20,21 @@
<%= csrf_meta_tag %>
</head>
<body>
<div id="panel_header">
<ul id="panel_nav">
<div id="banner_link" >
<div class="hmenu">
<div class="lang">
<%= render 'layouts/lang_menu' %>
</div>
<%= render 'devise/menu/login_items' %>
</div>
</div>
<div id="container">
<div id="header">
<h1>RulingSite <%= t('admin.item') %></h1>
<ul id="nav">
<li><%= link_to t('homepage'), root_path %></li>
<li><%= link_to t('admin.item'), admin_items_path %></li>
<li><%= link_to t('admin.design'), admin_designs_path %></li>
@@ -31,19 +44,15 @@
<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="panel_hmenu">
<li>
<%= render 'layouts/lang_menu' %>
</li>
<%= render 'devise/menu/login_items' %>
</ul>
</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 class="content">
<div id="panel_sidebar"><%= yield :sidebar %></div>
<div id="panel_main"><%= yield %></div>
</div>
<div id="panel_footer"><%= yield :footer %></div>
</div>
</body>
</html>
</html>