Skip to content
Snippets Groups Projects
Commit f01c2a64 authored by Mauricio Giacomini Girardello's avatar Mauricio Giacomini Girardello
Browse files

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

parents 9f818116 bd7e4bc2
No related branches found
No related tags found
No related merge requests found
<h2>Change your password</h2> <h2>Mudar sua senha</h2>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
<%= devise_error_messages! %> <%= devise_error_messages! %>
<%= f.hidden_field :reset_password_token %> <%= f.hidden_field :reset_password_token %>
<div class="field"> <div class="field">
<%= f.label :password, "New password" %><br /> <%= f.label :password, "Nova Senha" %><br />
<% if @minimum_password_length %> <% if @minimum_password_length %>
<em>(<%= @minimum_password_length %> characters minimum)</em><br /> <em>(<%= @minimum_password_length %> caractéres no mínimo)</em><br />
<% end %> <% end %>
<%= f.password_field :password, autofocus: true, autocomplete: "off" %> <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
</div> </div>
<div class="field"> <div class="field">
<%= f.label :password_confirmation, "Confirm new password" %><br /> <%= f.label :password_confirmation, "Confirme a nova senha" %><br />
<%= f.password_field :password_confirmation, autocomplete: "off" %> <%= f.password_field :password_confirmation, autocomplete: "off" %>
</div> </div>
<div class="actions"> <div class="actions">
<%= f.submit "Change my password" %> <%= f.submit "Mudar minha senha" %>
</div> </div>
<% end %> <% end %>
......
<h2>Forgot your password?</h2> <h2>Esqueceu sua senha?</h2>
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %> <%= devise_error_messages! %>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</div> </div>
<div class="actions"> <div class="actions">
<%= f.submit "Send me reset password instructions" %> <%= f.submit "Envie-me instruções para atualizar a senha" %>
</div> </div>
<% end %> <% end %>
......
<h2>Edit <%= resource_name.to_s.humanize %></h2> <h2>Editar <%= resource_name.to_s.humanize %></h2>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put, multipart: true}) do |f| %> <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: {method: :put, multipart: true}) do |f| %>
<%= devise_error_messages! %> <%= devise_error_messages! %>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<% end %> <% end %>
<div class="field"> <div class="field">
<%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br/> <%= f.label :password, "Nova senha" %> <i>(deixe em branco caso não queira mudar a senha)</i><br/>
<%= f.password_field :password, autocomplete: "off" %> <%= f.password_field :password, autocomplete: "off" %>
</div> </div>
...@@ -33,17 +33,17 @@ ...@@ -33,17 +33,17 @@
</div> </div>
<div class="field"> <div class="field">
<%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br/> <%= f.label :current_password %> <i>(precisamos da sua senha atual para confirmar suas mudanças)</i><br/>
<%= f.password_field :current_password, autocomplete: "off" %> <%= f.password_field :current_password, autocomplete: "off" %>
</div> </div>
<div class="actions"> <div class="actions">
<%= f.submit "Update" %> <%= f.submit "Salvar" %>
</div> </div>
<% end %> <% end %>
<h3>Cancel my account</h3> <h3>Excluir minha conta</h3>
<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: {confirm: "Are you sure?"}, method: :delete %></p> <p><%= button_to "Excluir", registration_path(resource_name), data: {confirm: "Você tem certeza?"}, method: :delete %></p>
<%= link_to "Back", :back %> <%= link_to "Voltar", :back %>
<h2>Sign up</h2> <h2>Cadastrar</h2>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %> <%= devise_error_messages! %>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="field"> <div class="field">
<%= f.label :password %> <%= f.label :password %>
<% if @minimum_password_length %> <% if @minimum_password_length %>
<em>(<%= @minimum_password_length %> characters minimum)</em> <em>(<%= @minimum_password_length %> caractéres mínimos)</em>
<% end %><br/> <% end %><br/>
<%= f.password_field :password, autocomplete: "off" %> <%= f.password_field :password, autocomplete: "off" %>
</div> </div>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
<div class="actions"> <div class="actions">
<%= f.submit "Sign up" %> <%= f.submit "Cadastrar" %>
</div> </div>
<% end %> <% end %>
......
<h2>Log in</h2> <h2>Entrar</h2>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="field"> <div class="field">
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<% end -%> <% end -%>
<div class="actions"> <div class="actions">
<%= f.submit "Log in" %> <%= f.submit "Entrar" %>
</div> </div>
<% end %> <% end %>
......
<%- if controller_name != 'sessions' %> <%- if controller_name != 'sessions' %>
<%= link_to "Log in", new_session_path(resource_name) %><br /> <%= link_to "Entrar", new_session_path(resource_name) %><br />
<% end -%> <% end -%>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %> <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
<%= link_to "Sign up", new_registration_path(resource_name) %><br /> <%= link_to "Cadastrar", new_registration_path(resource_name) %><br />
<% end -%> <% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
<%= link_to "Forgot your password?", new_password_path(resource_name) %><br /> <%= link_to "Esqueceu sua senha?", new_password_path(resource_name) %><br />
<% end -%> <% end -%>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
<%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br /> <%= link_to "Não recebeu instruções de confirmação?", new_confirmation_path(resource_name) %><br />
<% end -%> <% end -%>
<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
<%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br /> <%= link_to "Não recebeu instruções de destravamento?", new_unlock_path(resource_name) %><br />
<% end -%> <% end -%>
<%- if devise_mapping.omniauthable? %> <%- if devise_mapping.omniauthable? %>
<%- resource_class.omniauth_providers.each do |provider| %> <%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br /> <%= link_to "Entre com #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%> <% end -%>
<% end -%> <% end -%>
...@@ -9,8 +9,12 @@ class MassiveDspaceSyncWorker ...@@ -9,8 +9,12 @@ class MassiveDspaceSyncWorker
begin begin
dspace_repository.get_item_by_id id["id_dspace"] dspace_repository.get_item_by_id id["id_dspace"]
rescue rescue
puts "----------------------------------------------"
puts "ITEM WILL BE REMOVED: #{item.to_json}"
puts "----------------------------------------------"
broken_item = learning_object_repository.find id["id"] broken_item = learning_object_repository.find id["id"]
learning_object_repository.destroy broken_item learning_object_repository.destroy broken_item
end end
end end
......
...@@ -118,6 +118,10 @@ pt-BR: ...@@ -118,6 +118,10 @@ pt-BR:
user: user:
name: "Nome" name: "Nome"
email: "Email" email: "Email"
avatar: "Foto de perfil"
password: "Senha"
password_confirmation: "Confirme sua senha"
current_password: "Senha atual"
errors: errors:
template: template:
header: header:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment