conflict

[pettanr/pettanr.git] / app / views / layouts / yasapp.html.erb
diff --git a/app/views/layouts/yasapp.html.erb b/app/views/layouts/yasapp.html.erb

index 8d90e8a..711693e 100644 (file)
--- a/app/views/layouts/yasapp.html.erb
+++ b/app/views/layouts/yasapp.html.erb
@@ -1,5 +1,5 @@
  <!DOCTYPE html>\r
-<html lang="<%= I18n.locale -%>">\r
+<html lang="<%= I18n.locale -%>" env="<%= Rails.env -%>">\r
  <head>\r
    <title>\r
      ap - <%= h(manifest.magic_numbers['profile']['users']['caption']) %>\r
@@ -25,47 +25,14 @@
  </script>\r
  <script type="text/template" id="sign_in">\r
    <h1>\r
-    <%= link_to h(manifest.magic_numbers['profile']['users']['caption']), root_path %>\r
+    <%= t('yasapp.sign_in.caption') %>\r
    </h1>\r
    <h2>\r
-    <%= sanitize manifest.magic_numbers['profile']['users']['description'], :tags => %w(a p img br) %>\r
+    <%= t('yasapp.sign_in.subject') %>\r
    </h2>\r
    <div>\r
-    <%= t('users.signin.notice') %>\r
+    <%= link_to t('yasapp.sign_in.navi'), main_app.new_user_session_path %>\r
    </div>\r
-  <ul class="auth-servers">\r
-    <li class="twitter">\r
-      <%= link_to t('users.signin.twitter.caption'), user_omniauth_authorize_path(:twitter) %>\r
-      <%= link_to tag(:img, :src => '/images/twitter.png'), user_omniauth_authorize_path(:twitter) %>\r
-      <p><%= t('users.signin.twitter.notice') %></p>\r
-    </li>\r
-    <li class="google">\r
-      <%= link_to t('users.signin.google.caption'), user_omniauth_authorize_path(:google_oauth2) %>\r
-      <%= link_to tag(:img, :src => '/images/google.png'), user_omniauth_authorize_path(:google_oauth2) %>\r
-    </li>\r
-  </ul>\r
-  <div class="row_break"></div>\r
-  <form method="post" action="/users/sign_in" accept-charset="UTF-8">\r
-  <div>\r
-    <label for="user_email">em</label><br>\r
-    <input type="email" value="" size="30" name="user[email]" id="user_email">\r
-  </div>\r
-\r
-  <div>\r
-    <label for="user_password">pw</label><br>\r
-    <input type="password" size="30" name="user[password]" id="user_password">\r
-  </div>\r
-\r
-  <div>\r
-    <input type="hidden" value="0" name="user[remember_me]">\r
-    <input type="checkbox" value="1" name="user[remember_me]" id="user_remember_me">\r
-    <label for="user_remember_me">remember_me</label>\r
-  </div>\r
-\r
-  <div>\r
-    <input type="submit" value="login" name="commit">\r
-  </div>\r
-</form>\r
  </script>\r
  </body>\r
  </html>\r