X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fviews%2Flayouts%2Fsystem.html.erb;h=273047f45ae9538a1354747906e08014e064ee96;hb=31124ac1df4b11438308bb83525753b3e40e355a;hp=f5abbcf19b2e4695d198db52ba205afb8d14ee0a;hpb=6f2a183413df55de274cf896a0b54fceb6be00bf;p=pettanr%2Fpettanr.git
diff --git a/app/views/layouts/system.html.erb b/app/views/layouts/system.html.erb
index f5abbcf1..273047f4 100644
--- a/app/views/layouts/system.html.erb
+++ b/app/views/layouts/system.html.erb
@@ -1,9 +1,10 @@
- <%= h(MagicNumber['profile']['admins']['caption']) %>
- <%= stylesheet_link_tag "test.css" %>
+ <%= h(Manifest.manifest.magic_numbers['profile']['admins']['caption']) %>
+ <%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application" %>
+ <%= raw panel_editor_javascript_include_tags %>
<%= csrf_meta_tags %>
@@ -11,13 +12,15 @@
<% if user_signed_in? %>
<%= link_to t('home.index.title'), '/home' %>
- <%= link_to t('home.scrolls.title'), '/home/scroll' %>
- <%= link_to t('home.panels.title'), '/home/panel' %>
- <%= link_to t('home.panel_pictures.title'), '/home/panel_picture' %>
- <%= link_to h(truncate(@author.name, :length => 12)), main_app.author_path(@author) %>
- <% if @artist %>
+ <% if @operators.author %>
+ <%= link_to t('home.scrolls.title'), '/home/scroll' %>
+ <%= link_to t('home.panels.title'), '/home/panel' %>
+ <%= link_to t('home.panel_pictures.title'), '/home/panel_picture' %>
+ <%= link_to h(truncate(@operators.author.name, :length => 12)), main_app.author_path(@operators.author) %>
+ <% end %>
+ <% if @operators.artist %>
<%= link_to t('home.pictures.title'), main_app.original_pictures_path %>
- <%= link_to h(truncate(@artist.name, :length => 12)), main_app.artist_path(@artist) %>
+ <%= link_to h(truncate(@operators.artist.name, :length => 12)), main_app.artist_path(@operators.artist) %>
<% end %>
<%= link_to t('home.configure.title'), '/home/configure' %>
<%= link_to t('home.sign_out.title'), main_app.destroy_user_session_path, :method => :delete %>
@@ -31,9 +34,6 @@
<%= link_to "browse", '/system/browse' %>
<%= link_to "approve", '/system/waiting_list' %>
<%= link_to "token", '/system/auth_token' %>
- layout:
- <%= link_to "test", '/system/test_layout' %>
- <%= link_to "production", '/system/production_layout' %>
<%= link_to "sign out", main_app.destroy_admin_session_path, :method => :delete %>
<% else %>
<%= link_to "sign in", main_app.new_admin_session_path %>