Alguns ajustes. Relacionado com tarefa #708.

cercomp · Oct 1, 2013 · fc484e1 · fc484e1
1 parent 8fcb012
commit fc484e1
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 23 deletions.
diff --git a/app/views/admin/projects/repositories/_form.html.erb b/app/views/admin/projects/repositories/_form.html.erb
@@ -19,7 +19,7 @@
     Script para hook de autoupdate
     <pre>
 Post: curl -d id=<%= @repository.to_param %> -d project_id=<%= current_project.to_param %> -d version=$2 <%= root_url %>autoupdate
-Get: curl <%= root_url %>autoupdate?id=<%= @repository.to_param %>&project_id=<%= current_project.to_param %>&version=$2
+ Get: curl -k <%= root_url %>autoupdate?id=<%= @repository.to_param %>&project_id=<%= current_project.to_param %>&version=$2
     </pre>
   <% end %>
 

diff --git a/app/views/admin/projects/repositories/new.html.erb b/app/views/admin/projects/repositories/new.html.erb
@@ -1,3 +1,3 @@
-<h1>Novo Repositório</h1>
+<h1><%= t('.title') %></h1>
 
 <%= render 'form' %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -12,7 +12,7 @@
     <div class="container">
       <div class="row" id="header">
         <div class="col-sm-5">
-          <%= image_tag 'logo.png', class: 'logo' %>
+          <%= link_to (image_tag 'logo.png', class: 'logo'), root_path %>
         </div>
 
         <div class="col-sm-4 col-sm-offset-3 person">

diff --git a/app/views/session/forgot_password.html.erb b/app/views/session/forgot_password.html.erb
@@ -1,7 +1,7 @@
 <div class="navigation">
   <ul class="nav nav-pills">
     <li>
-      <%= link_to 'ENTRAR', login_path %>
+      <%= link_to t('.sign_in'), login_path %>
     </li>
     <% unless deny_signup? %>
       <li>
@@ -11,8 +11,8 @@
   </ul>
 </div>
 
-<h3 class='title'>Recuperar senha</h3>
-<p>Preencha o formulário para que sejam enviadas instruções de como mudar sua senha.</p>
+<h3 class='title'>Recuperar acesso</h3>
+<p><%= t('.info_recover_access') %></p>
 
 <%= form_tag forgot_password_path do %>
   <div class="form-group">

diff --git a/app/views/session/login.html.erb b/app/views/session/login.html.erb
@@ -16,9 +16,8 @@
 
   <div class="form-group">
     <%= password_field_tag :password, nil, class: 'form-control', placeholder: t('.password') %>
-
     <div class="reset-password">
-      Esqueceu a senha? <%= link_to t('.reset_password'), forgot_password_path %>
+      <%= link_to t('.forgot_password'), forgot_password_path %>
     </div>
   </div>
 

diff --git a/config/locales/simple_form/pt-BR.yml b/config/locales/simple_form/pt-BR.yml
@@ -11,16 +11,17 @@ pt-BR:
     error_notification:
       default_message: "Por favor, verifique os erros a seguir:"
     # Labels and hints examples
-    # labels:
-    #   defaults:
-    #     password: 'Password'
-    #   user:
-    #     new:
-    #       email: 'E-mail to sign in.'
-    #     edit:
-    #       email: 'E-mail.'
-    # hints:
-    #   defaults:
-    #     username: 'User name to sign in.'
-    #     password: 'No special characters, please.'
+    labels:
+      defaults:
+        login: 'Nome de usuário'
+        password: 'Senha'
+      user:
+        new:
+          email: 'Email'
+        edit:
+          email: 'Email'
+    hints:
+      defaults:
+        #username: 'Nome de usuário para autenticar.'
+        #password: 'Sem caracteres especiais, por favor.'
 
diff --git a/config/locales/views/admin/projects/repositories/pt-BR.yml b/config/locales/views/admin/projects/repositories/pt-BR.yml
@@ -0,0 +1,12 @@
+pt-BR:
+  admin:
+    projects:
+      repositories:
+        new:
+          title: Novo Repositório
+          auth_required: Este repositório exige autenticação
+          login: Login
+          password: Senha
+          submit: Autenticar
+        create:
+          auth_failed: A autenticação falhou
diff --git a/config/locales/views/admin/settings/pt-BR.yml b/config/locales/views/admin/settings/pt-BR.yml
@@ -1,7 +1,7 @@
 'pt-BR':
   admin:
     settings:
-      index:
+      show:
         allow_register: Habilitar Cadastro
         default_role: Papel padrão
         login_method: Método de login

diff --git a/config/locales/views/projects/repositories/auth/pt-BR.yml b/config/locales/views/projects/repositories/auth/pt-BR.yml
@@ -1,11 +1,13 @@
 pt-BR:
   projects:
     repositories:
+      new:
+        title: Novo Repositório
       auth:
         create:
           auth_failed: A autenticação falhou
         new:
           auth_required: Este repositório exige autenticação
           login: Login
-          pass: Senha
+          password: Senha
           submit: Autenticar
diff --git a/config/locales/views/session/pt-BR.yml b/config/locales/views/session/pt-BR.yml
@@ -5,6 +5,11 @@ pt-BR:
       password: Senha
       sign_in: Entrar
       sign_up: Cadastrar
-      reset_password: Recuperar senha
+      reset_password: Recuperar acesso
+      forgot_password: Esqueceu a senha?
+    forgot_password:
+      sign_in: Entrar
+      sign_up: Cadastrar
+      info_recover_access: Preencha o formulário para que sejam enviadas instruções de como recuperar seu acesso.
     alert:
       not_allow_register: O sistema não está aceitando registro de novos usuários