OSDN Git Service

(root) / pettanr / pettanr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 20ba1e9)
t#30460:add page title origin/v05
authoryasushiito <yas@pen-chan.jp>
Sun, 6 Jan 2013 04:38:31 +0000 (13:38 +0900)
committeryasushiito <yas@pen-chan.jp>
Sun, 6 Jan 2013 04:38:31 +0000 (13:38 +0900)
17 files changed:
app/views/admins/registrations/edit.html.erb patch | blob | history
app/views/admins/registrations/new.html.erb patch | blob | history
app/views/admins/sessions/new.html.erb patch | blob | history
app/views/artists/show.html.erb patch | blob | history
app/views/authors/show.html.erb patch | blob | history
app/views/comics/show.html.erb patch | blob | history
app/views/demand_users/registrations/edit.html.erb patch | blob | history
app/views/demand_users/registrations/new.html.erb patch | blob | history
app/views/demand_users/sessions/new.html.erb patch | blob | history
app/views/layouts/guest.html.erb patch | blob | history
app/views/layouts/metro.html.erb patch | blob | history
app/views/layouts/system.html.erb patch | blob | history
app/views/layouts/test.html.erb patch | blob | history
app/views/stories/comic.html.erb patch | blob | history
app/views/users/registrations/edit.html.erb patch | blob | history
app/views/users/registrations/new.html.erb patch | blob | history
app/views/users/sessions/new.html.erb patch | blob | history

diff --git a/app/views/admins/registrations/edit.html.erb b/app/views/admins/registrations/edit.html.erb
index ff38050..dc598c8 100644 (file)
--- a/app/views/admins/registrations/edit.html.erb
+++ b/app/views/admins/registrations/edit.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('admins.signin.title') %>
 <h2>Edit <%= resource_name.to_s.humanize %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
diff --git a/app/views/admins/registrations/new.html.erb b/app/views/admins/registrations/new.html.erb
index 14d5864..e41727d 100644 (file)
--- a/app/views/admins/registrations/new.html.erb
+++ b/app/views/admins/registrations/new.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('admins.signup.title') %>
 <h2><%= t('admins.signup.title') %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
diff --git a/app/views/admins/sessions/new.html.erb b/app/views/admins/sessions/new.html.erb
index 2383463..d735cb0 100644 (file)
--- a/app/views/admins/sessions/new.html.erb
+++ b/app/views/admins/sessions/new.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('admins.signin.title') %>
 <h2><%= t('admins.signin.title') %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
diff --git a/app/views/artists/show.html.erb b/app/views/artists/show.html.erb
index c791476..6c58138 100644 (file)
--- a/app/views/artists/show.html.erb
+++ b/app/views/artists/show.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('.title') + ':' + @ar.name %>
 <h1><%= t '.title' -%></h1>
 <p id="notice"><%= notice %></p>
 
diff --git a/app/views/authors/show.html.erb b/app/views/authors/show.html.erb
index 555278e..a203fec 100644 (file)
--- a/app/views/authors/show.html.erb
+++ b/app/views/authors/show.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('.title') + ':' + @au.name %>
 <h1><%= t '.title' -%></h1>
 <p id="notice"><%= notice %></p>
 
diff --git a/app/views/comics/show.html.erb b/app/views/comics/show.html.erb
index aa712a3..fee9107 100644 (file)
--- a/app/views/comics/show.html.erb
+++ b/app/views/comics/show.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('.title') + ':' + @comic.title %>
 <h1><%= t('.title') %></h1>
 <p id="notice"><%= notice %></p>
 
diff --git a/app/views/demand_users/registrations/edit.html.erb b/app/views/demand_users/registrations/edit.html.erb
index ff38050..1cece2f 100644 (file)
--- a/app/views/demand_users/registrations/edit.html.erb
+++ b/app/views/demand_users/registrations/edit.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('admins.signup.title') %>
 <h2>Edit <%= resource_name.to_s.humanize %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
diff --git a/app/views/demand_users/registrations/new.html.erb b/app/views/demand_users/registrations/new.html.erb
index c6e2f1b..04ea23c 100644 (file)
--- a/app/views/demand_users/registrations/new.html.erb
+++ b/app/views/demand_users/registrations/new.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('demand_users.signup.title') %>
 <h2><%= t('demand_users.signup.title') %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
diff --git a/app/views/demand_users/sessions/new.html.erb b/app/views/demand_users/sessions/new.html.erb
index 73258ed..b5281e2 100644 (file)
--- a/app/views/demand_users/sessions/new.html.erb
+++ b/app/views/demand_users/sessions/new.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('demand_users.signin.title') %>
 <h2><%= t('demand_users.signin.title') %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
diff --git a/app/views/layouts/guest.html.erb b/app/views/layouts/guest.html.erb
index 4d76cf6..fcee1ad 100644 (file)
--- a/app/views/layouts/guest.html.erb
+++ b/app/views/layouts/guest.html.erb
@@ -1,7 +1,14 @@
 <!DOCTYPE html>\r
 <html>\r
 <head>\r
-  <title>Pettanr</title>\r
+  <title>\r
+    <% if @page_title %>\r
+      <%= h @page_title %>\r
+    <% else %>\r
+      <%= t("#{params[:controller]}.#{params[:action]}.title") %>\r
+    <% end %>\r
+    - <%= h(MagicNumber['profile']['caption']) %>\r
+  </title>\r
   <%= stylesheet_link_tag "test.css" %>\r
   <%= javascript_include_tag "application" %>\r
   <%= csrf_meta_tags %>\r
diff --git a/app/views/layouts/metro.html.erb b/app/views/layouts/metro.html.erb
index 44212d5..395ee09 100644 (file)
--- a/app/views/layouts/metro.html.erb
+++ b/app/views/layouts/metro.html.erb
@@ -6,7 +6,7 @@
                <meta http-equiv="Content-Script-Type" content="text/javascript">\r
                <meta http-equiv="Content-Style-Type" content="text/css">\r
                <meta http-equiv="imagetoolbar" content="no">\r
-               <title>Pettanr</title>\r
+               <title><%= h(MagicNumber['profile']['caption']) %></title>\r
                <%= stylesheet_link_tag "system.css" %>\r
                <%= stylesheet_link_tag "peta.common.css" %>\r
                <%= csrf_meta_tags %>\r
diff --git a/app/views/layouts/system.html.erb b/app/views/layouts/system.html.erb
index 4deb11b..8b8b1d1 100644 (file)
--- a/app/views/layouts/system.html.erb
+++ b/app/views/layouts/system.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Pettanr</title>
+  <title><%= h(MagicNumber['profile']['caption']) %></title>
   <%= stylesheet_link_tag "test.css" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
diff --git a/app/views/layouts/test.html.erb b/app/views/layouts/test.html.erb
index 66fd190..135133b 100644 (file)
--- a/app/views/layouts/test.html.erb
+++ b/app/views/layouts/test.html.erb
@@ -1,7 +1,14 @@
 <!DOCTYPE html>\r
 <html>\r
 <head>\r
-  <title>Pettanr</title>\r
+  <title>\r
+    <% if @page_title %>\r
+      <%= h @page_title %>\r
+    <% else %>\r
+      <%= t("#{params[:controller]}.#{params[:action]}.title") %>\r
+    <% end %>\r
+    - <%= h(MagicNumber['profile']['caption']) %>\r
+  </title>\r
   <%= stylesheet_link_tag "test.css" %>\r
   <%= javascript_include_tag "application" %>\r
   <%= csrf_meta_tags %>\r
diff --git a/app/views/stories/comic.html.erb b/app/views/stories/comic.html.erb
index a78f843..9c042e5 100644 (file)
--- a/app/views/stories/comic.html.erb
+++ b/app/views/stories/comic.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = @comic.title %>
 <h1><%= t '.title' -%></h1>
 <p id="notice"><%= notice %></p>
 <%= render 'comic_header', :comic => @comic, :author => @author %>
diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb
index 9bd9376..2c4c16c 100644 (file)
--- a/app/views/users/registrations/edit.html.erb
+++ b/app/views/users/registrations/edit.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('home.configure.password_caption') %>
 <h2><%= t 'home.configure.password_caption' -%></h2>
 
 <%= render '/users/registrations/form', :resource => resource %>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index ce0af4e..f7ba8f7 100644 (file)
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -1,3 +1,4 @@
+<% @page_title = t('users.signup.title') %>
 <h2><%= t('users.signup.title') %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
index d1471ec..2d924c6 100644 (file)
--- a/app/views/users/sessions/new.html.erb
+++ b/app/views/users/sessions/new.html.erb
@@ -1,4 +1,5 @@
-<h1><%= link_to MagicNumber['profile']['caption'], root_path %></h1>
+<% @page_title = t('users.signin.signin') %>
+<h1><%= link_to h(MagicNumber['profile']['caption']), root_path %></h1>
 <table class="no-border">
   <tr>
     <td width="60%">
サーバ側、Railsシステム本体
About OSDN
Find Software
Develop Software
Help