t#30459:update style at login page

diff --git a/Gemfile b/Gemfile
index bc23565..b9b9b40 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,7 @@ end
 group :development, :test do
   gem 'sqlite3'
   gem 'webrat'
-  gem 'rspec', '~> 2.12.0'
+  gem 'rspec', '~> 2.13.0'
    gem 'rspec-rails'
    gem 'cucumber'
    gem 'cucumber-rails'

diff --git a/app/views/admins/sessions/new.html.erb b/app/views/admins/sessions/new.html.erb
index d735cb0..3e172ad 100644 (file)
--- a/app/views/admins/sessions/new.html.erb
+++ b/app/views/admins/sessions/new.html.erb
@@ -1,17 +1,26 @@
 <% @page_title = t('admins.signin.title') %>
-<h2><%= t('admins.signin.title') %></h2>
+<h1><%= link_to h(MagicNumber['profile']['admins']['caption']), root_path %></h1>
 
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+<table class="no-border" style="background-color: #aa7777;">
+  <tr>
+    <td width="60%">
+      <p><%= sanitize MagicNumber['profile']['admins']['description'], :tags => %w(a p img br) %></p>
+    </td>
+    <td width="40%">
+      <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+        <div><%= f.label :email %><br />
+        <%= f.email_field :email %></div>
 
-  <div><%= f.label :password %><br />
-  <%= f.password_field :password %></div>
+        <div><%= f.label :password %><br />
+        <%= f.password_field :password %></div>
 
-  <% if devise_mapping.rememberable? -%>
-    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
-  <% end -%>
+        <% if devise_mapping.rememberable? -%>
+          <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+        <% end -%>
 
-  <div><%= f.submit t('admins.signin.signin') %></div>
-<% end %>
-<%= render :partial => "admins/shared/links" %>
+        <div><%= f.submit t('admins.signin.signin') %></div>
+      <% end %>
+      <%= render :partial => "admins/shared/links" %>
+    </td>
+  </tr>
+</table>

diff --git a/app/views/demand_users/sessions/new.html.erb b/app/views/demand_users/sessions/new.html.erb
index b5281e2..a9f4ac1 100644 (file)
--- a/app/views/demand_users/sessions/new.html.erb
+++ b/app/views/demand_users/sessions/new.html.erb
@@ -1,18 +1,26 @@
 <% @page_title = t('demand_users.signin.title') %>
-<h2><%= t('demand_users.signin.title') %></h2>
+<h1><%= link_to h(MagicNumber['profile']['demand_users']['caption']), root_path %></h1>
 
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+<table class="no-border" style="background-color: #aaaa77;">
+  <tr>
+    <td width="60%">
+      <p><%= sanitize MagicNumber['profile']['demand_users']['description'], :tags => %w(a p img br) %></p>
+    </td>
+    <td width="40%">
+      <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+        <div><%= f.label :email %><br />
+        <%= f.email_field :email %></div>
 
-  <div><%= f.label :password %><br />
-  <%= f.password_field :password %></div>
+        <div><%= f.label :password %><br />
+        <%= f.password_field :password %></div>
 
-  <% if devise_mapping.rememberable? -%>
-    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
-  <% end -%>
+        <% if devise_mapping.rememberable? -%>
+          <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+        <% end -%>
 
-  <div><%= f.submit t('demand_users.signin.signin') %></div>
-<% end %>
-
-<%= render :partial => "demand_users/shared/links" %>
+        <div><%= f.submit t('demand_users.signin.signin') %></div>
+      <% end %>
+      <%= render :partial => "demand_users/shared/links" %>
+    </td>
+  </tr>
+</table>

diff --git a/app/views/layouts/guest.html.erb b/app/views/layouts/guest.html.erb
index fcee1ad..aa0c6f7 100644 (file)
--- a/app/views/layouts/guest.html.erb
+++ b/app/views/layouts/guest.html.erb
@@ -7,7 +7,7 @@
     <% else %>\r
       <%= t("#{params[:controller]}.#{params[:action]}.title") %>\r
     <% end %>\r
-    - <%= h(MagicNumber['profile']['caption']) %>\r
+    - <%= h(MagicNumber['profile']['users']['caption']) %>\r
   </title>\r
   <%= stylesheet_link_tag "test.css" %>\r
   <%= javascript_include_tag "application" %>\r

diff --git a/app/views/layouts/metro.html.erb b/app/views/layouts/metro.html.erb
index 3317580..10eb9cd 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><%= h(MagicNumber['profile']['caption']) %></title>\r
+               <title><%= h(MagicNumber['profile']['users']['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 8b8b1d1..a016ec9 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><%= h(MagicNumber['profile']['caption']) %></title>
+  <title><%= h(MagicNumber['profile']['admins']['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 7d80baa..6725e51 100644 (file)
--- a/app/views/layouts/test.html.erb
+++ b/app/views/layouts/test.html.erb
@@ -7,7 +7,7 @@
     <% else %>\r
       <%= t("#{params[:controller]}.#{params[:action]}.title") %>\r
     <% end %>\r
-    - <%= h(MagicNumber['profile']['caption']) %>\r
+    - <%= h(MagicNumber['profile']['users']['caption']) %>\r
   </title>\r
   <%= stylesheet_link_tag "test.css" %>\r
   <%= javascript_include_tag "application" %>\r
@@ -19,7 +19,7 @@
 <table class="no-border">\r
   <tr>\r
     <td width="80%">\r
-      <h3><%= link_to MagicNumber['profile']['caption'], main_app.root_path %></h3>\r
+      <h3><%= link_to MagicNumber['profile']['users']['caption'], main_app.root_path %></h3>\r
     </td>\r
     <td>\r
       <div>\r

diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
index 2d924c6..5ec1235 100644 (file)
--- a/app/views/users/sessions/new.html.erb
+++ b/app/views/users/sessions/new.html.erb
@@ -1,9 +1,9 @@
 <% @page_title = t('users.signin.signin') %>
-<h1><%= link_to h(MagicNumber['profile']['caption']), root_path %></h1>
+<h1><%= link_to h(MagicNumber['profile']['users']['caption']), root_path %></h1>
 <table class="no-border">
   <tr>
     <td width="60%">
-      <p><%= sanitize MagicNumber['profile']['description'], :tags => %w(a p img br) %></p>
+      <p><%= sanitize MagicNumber['profile']['users']['description'], :tags => %w(a p img br) %></p>
     </td>
     <td width="40%">
       <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>

diff --git a/config/locales/pettanr.ja.yml b/config/locales/pettanr.ja.yml
index 4c9c49d..1a67233 100644 (file)
--- a/config/locales/pettanr.ja.yml
+++ b/config/locales/pettanr.ja.yml
@@ -346,52 +346,36 @@ ja:
       reset: 新しいパスワードを発行する
   admins:
     shared:
-      signin: ログイン
+      signin: 管理者ログイン
       signup: 新規入会
       forgot: パスワードを忘れた
     signup:
       title: 管理者登録
       signup: 登録する
     signin:
-      title: ログイン
-      signin: ログイン
-    edit:
-      title: アカウントの設定変更
-    forgot:
-      title: パスワードを忘れてしまった
-      reset: 新しいパスワードを発行する
-  users:
-    shared:
-      signin: ログイン
-      signup: 新規入会
-      forgot: パスワードを忘れた
-    signup:
-      title: ユーザ登録
-      signup: 登録する
-    signin:
-      title: ログイン
+      title: 管理者ログイン
       signin: ログイン
     edit:
-      title: アカウントの設定変更
+      title: 管理者アカウントの設定変更
     forgot:
-      title: パスワードを忘れてしまった
-      reset: 新しいパスワードを発行する
+      title: 管理者パスワードを忘れてしまった
+      reset: 新しい管理者パスワードを発行する
   demand_users:
     shared:
-      signin: ログイン
+      signin: 借手ログイン
       signup: 新規入会
       forgot: パスワードを忘れた
     signup:
-      title: ユーザ登録
+      title: 借手登録
       signup: 登録する
     signin:
-      title: ログイン
+      title: 借手ログイン
       signin: ログイン
     edit:
-      title: アカウントの設定変更
+      title: 借手アカウントの設定変更
     forgot:
-      title: パスワードを忘れてしまった
-      reset: 新しいパスワードを発行する
+      title: 借手パスワードを忘れてしまった
+      reset: 新しい借手パスワードを発行する
   home:
     index:
       title: ホーム