diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index f95f3f9c241b3fbb1150f2d6b3aaf9f12d1a2a51..65ba7f3d9594236df4225461288b4d7aad11eebd 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -487,8 +487,6 @@ header {
}
}
-@media only screen and (min-width: 1010px) {
-/*For Desktops*/
footer {
padding-top: 50px;
color: #FFF;
@@ -499,97 +497,21 @@ header {
min-height: 256px;
.container-height{
- min-height: 200px;
.top-padding{
padding-top: 50px;
}
}
- .logo-footer{
- width: 18%;
-
- .logos-footer{
- height: 70px;
- }
- .ministerio-size{
- margin-left: 60px;
- }
- .fnde-size{
- height: 100px;
- margin-top: -8%;
- margin-left: 20px;
- }
- .ufpr-size{
- margin-left: 60px;
- }
- .c3sl-size{
- margin-left: 40px;
- }
- }
- }
-
- .footerbar{
- padding: 16px;
- background-color: #AAB1AD;
- }
- .footer-bar {
- color: #FFF;
- background-color: #2178F5;
-
- .logo {
- text-align: center;
- width: 165px;
- margin: 10px auto auto auto;
-
- h3 {
- margin-top: 10px;
- font-weight: 400;
- }
- a {
- color: #FFF;
- }
- }
- }
- }
-}
-
-@media only screen and (min-width: 600px) and (max-width: 1009px){
-/*For tablets*/
- footer {
- padding-top: 30px;
- color: #FFF;
-
- .main {
- background-color: #E6E6E6;
- padding: 16px 0px 0px 0px;
- min-height: 200px;
-
- .container-height{
- min-height: 140px;
- .top-padding{
- padding-top: 30px;
- }
- }
-
- .logo-footer{
- width: 2%;
- display: inline-block;
-
- .logos-footer{
- height: 40px;
- }
- .ministerio-size{
- margin-left: 120px;
- }
- .fnde-size{
- height: 60px;
- margin-top: -8%;
- margin-left: 170px;
- }
- .ufpr-size{
- margin-left: 290px;
+ .logos-footer{
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+ margin-bottom: 30px;
+ img{
+ width: auto;
}
- .c3sl-size{
- margin-left: 370px;
+ .logo-footer{
+ height: 70px;
+ display: inline-block;
}
}
}
@@ -617,73 +539,9 @@ header {
}
}
}
-}
-
-@media only screen and (max-width: 599px){
-/*For Smartphones*/
- footer {
- padding-top: 20px;
- color: #FFF;
-
- .main {
- background-color: #E6E6E6;
- padding: 5px 0px 0px 0px;
- min-height: 156px;
- .container-height{
- min-height: 90px;
- .top-padding{
- padding-top: 10px;
- }
- }
- .logo-footer{
- width: 2%;
- display: inline-block;
- .logos-footer{
- height: 18px;
- }
- .ministerio-size{
- margin-left: 40px;
- }
- .fnde-size{
- height: 60px;
- margin-top: -8%;
- margin-left: 50px;
- }
- .ufpr-size{
- margin-left: 150px;
- }
- .c3sl-size{
- margin-left: 170px;
- }
- }
- }
-
- .footerbar{
- padding: 16px;
- background-color: #AAB1AD;
- }
- .footer-bar {
- color: #FFF;
- background-color: #2178F5;
-
- .logo {
- margin: 10px auto auto auto;
- text-align: center;
- width: 100px;
- h3 {
- margin-top: 5px;
- font-weight: 300;
- }
- a {
- color: #FFF;
- }
- }
- }
- }
-}
td.stars {
width: 22%;
@@ -1054,6 +912,6 @@ input.chk {
}
.send-new-item h3{
- position: relative;
padding-left: 20px;
+ position: relative;
}
diff --git a/app/assets/stylesheets/application/learning_objects.scss b/app/assets/stylesheets/application/learning_objects.scss
index 17cdf3e2cefec37e6f3a0ec8bb02ae064327c341..f2077fd6a3a0893d8ffa6fa7a3cc29bc736a8f48 100644
--- a/app/assets/stylesheets/application/learning_objects.scss
+++ b/app/assets/stylesheets/application/learning_objects.scss
@@ -230,6 +230,16 @@ $checked_icon: 'icons/checked.png';
margin-top: 5px;
}
}
+ .bookmark{
+ i{
+ padding-top: 3px;
+ color: #818080;
+ width: 20px;
+ height: 20px;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ }
+ }
.download{
line-height: 35px;
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index d4aee9e51cf831e20da805bc0db77e8362173dd3..fd8ca3a098e7745f3b1dbaf67f006f3e7cdaed41 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -60,7 +60,7 @@ class CollectionsController < ApplicationController
respond_to do |format|
if @collection.save
- format.html { redirect_to :back, notice: 'Coleção criada com sucesso.' }
+ format.html { redirect_to :back, notice: t('activerecord.attributes.collection.create.notice.successfully_created') }
else
format.html { render :new }
end
@@ -72,7 +72,7 @@ class CollectionsController < ApplicationController
def update
respond_to do |format|
if Collection.update(collection_params)
- format.html { redirect_to @collection, notice: 'Coleção atualizada com sucesso.' }
+ format.html { redirect_to @collection, notice: t('activerecord.attributes.collection.update.notice.successfully_updated') }
else
format.html { render :edit }
end
@@ -85,7 +85,7 @@ class CollectionsController < ApplicationController
Collection.destroy @collection
respond_to do |format|
- format.html { redirect_to user_path(current_user), notice: 'Coleção excluida com sucesso.' }
+ format.html { redirect_to user_path(current_user), notice: t('activerecord.attributes.collection.destroy.notice.successfully_destroy') }
end
end
diff --git a/app/controllers/complaints_controller.rb b/app/controllers/complaints_controller.rb
index c83724f235e47114724a38f375de20f7dda1fd5a..0766279742594ccac197ebb57f097158e3b562a8 100644
--- a/app/controllers/complaints_controller.rb
+++ b/app/controllers/complaints_controller.rb
@@ -10,9 +10,9 @@ class ComplaintsController < ApplicationController
respond_to do |format|
if complaint.save
- format.html { redirect_to :back, notice: 'Denúncia realizada com sucesso.' }
+ format.html { redirect_to :back, notice: t('activerecord.attributes.complaint.create.notice.sucess') }
else
- format.html { redirect_to :back, alert: 'Objeto já foi denunciado por você.' }
+ format.html { redirect_to :back, alert: t('activerecord.attributes.complaint.create.alert.failure') }
end
end
end
diff --git a/app/controllers/feedbacks_controller.rb b/app/controllers/feedbacks_controller.rb
index e511d602599c0ec74b0e08ed4fc9bde4f2cabe38..bf391b700c3b8f13aff4b4a7ec5228b46c51c575 100644
--- a/app/controllers/feedbacks_controller.rb
+++ b/app/controllers/feedbacks_controller.rb
@@ -32,7 +32,7 @@ class FeedbacksController < ApplicationController
respond_to do |format|
if feedback_service.report_bug @bug
- format.html { redirect_to :back, notice: 'Problema relatado com sucesso!' }
+ format.html { redirect_to :back, notice: t('activerecord.attributes.feedback.report_bug.notice.success') }
end
end
end
diff --git a/app/controllers/institutions_controller.rb b/app/controllers/institutions_controller.rb
index 0496cd655fae13d66302beda0fa3784c0a689ff5..0f89f86b0a5bf486916863ece16809455b1162d8 100644
--- a/app/controllers/institutions_controller.rb
+++ b/app/controllers/institutions_controller.rb
@@ -31,7 +31,7 @@ class InstitutionsController < ApplicationController
respond_to do |format|
if Institution.save @institution
- format.html { redirect_to @institution, notice: 'Institution was successfully created.' }
+ format.html { redirect_to @institution, notice: t('activerecord.attributes.institution.create.notice.successfully_created') }
else
format.html { render :new }
end
@@ -43,7 +43,7 @@ class InstitutionsController < ApplicationController
def update
respond_to do |format|
if Institution.update(institution_params)
- format.html { redirect_to @learning_object, notice: 'Institution was successfully updated.' }
+ format.html { redirect_to @learning_object, notice: t('activerecord.attributes.institution.update.notice.successfully_updated') }
else
format.html { render :edit }
end
@@ -56,7 +56,7 @@ class InstitutionsController < ApplicationController
Institution.destroy @institution
respond_to do |format|
- format.html { redirect_to institutions_url, notice: 'Learning object was successfully destroyed.' }
+ format.html { redirect_to institutions_url, notice: t('activerecord.attributes.institution.destroy.notice.successfully_destroy') }
end
end
diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb
index 3995ddfb8e311ec309df1b8e655653713e9f9228..0f40b94dcad9e3e51fe9dd8039fee346e8ca4341 100644
--- a/app/controllers/learning_objects_controller.rb
+++ b/app/controllers/learning_objects_controller.rb
@@ -40,7 +40,7 @@ class LearningObjectsController < ApplicationController
# go to file submission page
format.html { success_redirect @learning_object }
else
- format.html { render :new, notice: 'Não foi possÃvel criar o objeto.' }
+ format.html { render :new, notice: t('activerecord.attributes.learning_object.create.notice.failure') }
end
end
@@ -64,7 +64,7 @@ class LearningObjectsController < ApplicationController
LearningObject.destroy @learning_object
respond_to do |format|
- format.html { redirect_to learning_objects_url, notice: 'Learning object was successfully destroyed.' }
+ format.html { redirect_to learning_objects_url, notice: t('activerecord.attributes.learning_object.destroy.notice.successfully_destroy') }
end
end
@@ -121,7 +121,7 @@ class LearningObjectsController < ApplicationController
def success_redirect(learning_object)
#if 'Website externo' == learning_object.object_type.name
- redirect_to learning_object_build_path(learning_object, :upload_attachments), notice: 'Seu objeto foi criado com sucesso!'
+ redirect_to learning_object_build_path(learning_object, :upload_attachments), notice: t('activerecord.attributes.learning_object.success_redirect.notice.successfully_created')
end
def set_form_objects
diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb
index 8cafb1f17617abc77bd4dec4bd29268ada9067a4..609690c42651f3ed1c6ef917f7fdfd2e6bfc2b89 100644
--- a/app/views/learning_objects/show.html.erb
+++ b/app/views/learning_objects/show.html.erb
@@ -79,6 +79,11 @@
<%= image_tag "icons/btn_add.png", alt: "Adicionar à coleção" %>
</a>
</div>
+ <div class="action">
+ <%= link_to bookmark_add_path(id: @learning_object.id, type: @learning_object.class.to_s), class:"btn btn-primary bookmark", title: "Adicionar aos favoritos", method: :post, remote: true do %>
+ <i class="fa fa-bookmark"></i>
+ <%end%>
+ </div>
<div class="action">
<%= render 'complaints/complaints_button' %>
</div>
diff --git a/app/views/management/carousels/_form.html.erb b/app/views/management/carousels/_form.html.erb
index 9c4fa033325ca034ee30381bc9fdc017379a6001..c763b8bc889fffbf0b7fa104790e3b00b3407d7d 100644
--- a/app/views/management/carousels/_form.html.erb
+++ b/app/views/management/carousels/_form.html.erb
@@ -2,7 +2,7 @@
<% if @carousel.errors.any? %>
<div class="ls-alert-danger">
- <h2><%= pluralize(@carousel.errors.count, "erro") %> <%= "happened".pluralize(@carousel.errors.count) %>:</h2>
+ <h2><%= pluralize(@carousel.errors.count, "erro") %> <%= "ocorreu".pluralize(@carousel.errors.count) %>:</h2>
<ul>
<% @carousel.errors.full_messages.each do |message| %>
<li><%= message %></li>
diff --git a/app/views/management/complaint_reasons/_form.html.erb b/app/views/management/complaint_reasons/_form.html.erb
index 07a08e4ec563ec28e36df56967ef6e5f656b169e..9e65eb93c12ac89f0db6ca60a122a27782466f49 100644
--- a/app/views/management/complaint_reasons/_form.html.erb
+++ b/app/views/management/complaint_reasons/_form.html.erb
@@ -2,7 +2,7 @@
<% if @complaint_reason.errors.any? %>
<div class="ls-alert-danger">
- <h2><%= pluralize(@complaint_reason.errors.count, "erro") %> <%= "happened".pluralize(@complaint_reason.errors.count) %>:</h2>
+ <h2><%= pluralize(@complaint_reason.errors.count, "erro") %> <%= "ocorreu".pluralize(@complaint_reason.errors.count) %>:</h2>
<ul>
<% @complaint_reason.errors.full_messages.each do |message| %>
<li><%= message %></li>
diff --git a/app/views/management/mime_types/_form.html.erb b/app/views/management/mime_types/_form.html.erb
index 8419a7d4f0ddb52f4daccb8f399753ccc5f1a256..5b165af2ee1c132b746556c2b74f2cb197f4472c 100644
--- a/app/views/management/mime_types/_form.html.erb
+++ b/app/views/management/mime_types/_form.html.erb
@@ -1,7 +1,7 @@
<%= form_for([:management, @mime_type]) do |f| %>
<% if @mime_type.errors.any? %>
<div id="error_explanation">
- <h2><%= pluralize(@mime_type.errors.count, "error") %> prohibited this management_mime_type from being saved:</h2>
+ <h2><%= pluralize(@mime_type.errors.count, "erro") %> impedem este mime_type de ser salvo:</h2>
<ul>
<% @mime_type.errors.full_messages.each do |message| %>
diff --git a/app/views/management/object_types/_form.html.erb b/app/views/management/object_types/_form.html.erb
index 7cb97dfb5a330720c731e6aae0ae133a9aa66ad0..77b367b3f895ea5ccf1329a32fda506cde3a1475 100644
--- a/app/views/management/object_types/_form.html.erb
+++ b/app/views/management/object_types/_form.html.erb
@@ -1,7 +1,7 @@
<%= form_for([:management ,@object_type]) do |f| %>
<% if @object_type.errors.any? %>
<div id="error_explanation">
- <h2><%= pluralize(@object_type.errors.count, "error") %> prohibited this management_object_type from being saved:</h2>
+ <h2><%= pluralize(@object_type.errors.count, "error") %> impedem este tipo de objeto de ser salvo:</h2>
<ul>
<% @object_type.errors.full_messages.each do |message| %>
@@ -47,4 +47,4 @@
placeholder: "MimeTypes",
width: '100%'
});
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/management/users/_form.html.erb b/app/views/management/users/_form.html.erb
index 4f8d70fd4db0e3c3e4a146ad48405ad44fd751df..ed16eaec3317bea42d467c94972a026e7e979e89 100644
--- a/app/views/management/users/_form.html.erb
+++ b/app/views/management/users/_form.html.erb
@@ -2,7 +2,7 @@
<% if @user.errors.any? %>
<div class="ls-alert-danger">
- <h2><%= pluralize(@user.errors.count, "erro") %> <%= "happened".pluralize(@user.errors.count) %>:</h2>
+ <h2><%= pluralize(@user.errors.count, "erro") %> <%= "ocorreu".pluralize(@user.errors.count) %>:</h2>
<ul>
<% @user.errors.full_messages.each do |message| %>
<li><%= message %></li>
diff --git a/app/views/shared/application/_footer.html.erb b/app/views/shared/application/_footer.html.erb
index d6c62da8734141051337b18f0aa76af323089e99..4af454f87a0342eea0a2217a9a39b2b68e30ad95 100644
--- a/app/views/shared/application/_footer.html.erb
+++ b/app/views/shared/application/_footer.html.erb
@@ -15,33 +15,37 @@
<div class="main">
<div class="container container-height">
<div class="row top-padding">
- <div class="logo-footer col-md-2">
+ <div class="col-md-12">
+ <div class="logos-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.brasil.gov.br/' do %>
- <%= image_tag 'logo_brasil.png',class:'logos-footer' %>
+ <%= image_tag 'logo_brasil.png',class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'logo_ministerio.png',class:'logos-footer ministerio-size' %>
+ <%= image_tag 'logo_ministerio.png',class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'fnde.png', class:'fnde-size' %>
+ <%= image_tag 'fnde.png', class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.ufpr.br/portalufpr/' do %>
- <%= image_tag 'logo_ufpr.jpg',class:'logos-footer ufpr-size'%>
+ <%= image_tag 'logo_ufpr.jpg',class:'logo-footer'%>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.c3sl.ufpr.br/' do %>
- <%= image_tag 'logo_c3.png', class:'logos-footer c3sl-size'%>
+ <%= image_tag 'logo_c3.png', class:'logo-footer'%>
<% end %>
</div>
+ </div>
</div>
</div>
+ </div>
<div class="footerbar">
<div class="container">
@@ -52,4 +56,5 @@
</div>
</div>
</div>
+</div>
</footer>
diff --git a/app/views/shared/application/_footer_home.html.erb b/app/views/shared/application/_footer_home.html.erb
index adc9be490525a674848fd4d1168a6b9ef365ff83..35e3f0e0ce41818c39d40f0fc2fd7cb0ffcf8220 100644
--- a/app/views/shared/application/_footer_home.html.erb
+++ b/app/views/shared/application/_footer_home.html.erb
@@ -28,33 +28,37 @@
<div class="main">
<div class="container container-height">
<div class="row top-padding">
- <div class="logo-footer col-md-2">
+ <div class="col-md-12">
+ <div class="logos-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.brasil.gov.br/' do %>
- <%= image_tag 'logo_brasil.png',class:'logos-footer' %>
+ <%= image_tag 'logo_brasil.png',class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'logo_ministerio.png',class:'logos-footer ministerio-size' %>
+ <%= image_tag 'logo_ministerio.png',class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'fnde.png', class:'fnde-size' %>
+ <%= image_tag 'fnde.png', class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.ufpr.br/portalufpr/' do %>
- <%= image_tag 'logo_ufpr.jpg',class:'logos-footer ufpr-size'%>
+ <%= image_tag 'logo_ufpr.jpg',class:'logo-footer'%>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.c3sl.ufpr.br/' do %>
- <%= image_tag 'logo_c3.png', class:'logos-footer c3sl-size'%>
+ <%= image_tag 'logo_c3.png', class:'logo-footer'%>
<% end %>
</div>
+ </div>
</div>
</div>
+</div>
<div class="footerbar">
<div class="container">
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index 1de38f3061c2e427718ff976272d285c612c382b..931fb5560a3eaf90a4c1593306aae47b39149545 100644
--- a/app/views/shared/application/_header.html.erb
+++ b/app/views/shared/application/_header.html.erb
@@ -67,7 +67,6 @@
<nav class="navigation" id="menu-bar">
<div class="container">
- <div class="row">
<ul class="nav navbar-nav">
<li role="separator" class="divider"></li>
<li class="dropdown nav-button"><h3><%= link_to 'Coleções Institucionais', collections_path %> </h3></li>
@@ -84,12 +83,11 @@
<%= image_tag "icons/Upload.png"%>
<h3>Enviar novo item</h3>
</div>
- <% end %>
+ <%end%>
</li>
<li role="separator" class="divider"></li>
</ul>
</div>
- </div>
</nav>
<div class="navigation-content">
<div class="container">
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 6670a9dce73ce690f231b3b0dd5391d8acffee83..024ab5f708da10d7d2734b26042f684c90d8062d 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -137,8 +137,45 @@ pt-BR:
object_type: "Tipo do objeto"
language: "Idioma"
author: "Autor"
+ create:
+ notice:
+ failure: "Não foi possÃvel criar o objeto."
+ destroy:
+ notice:
+ successfully_destroy: "Objeto educacional excluÃdo com sucesso."
+ success_redirect:
+ notice:
+ successfully_created: "Seu objeto educacional foi criado com sucesso!"
+ collection:
+ create:
+ notice:
+ successfully_created: "Coleção criada com sucesso."
+ update:
+ notice:
+ sucessfully_updated: "Coleção atualizada com sucesso."
+ destroy:
+ notice:
+ successfully_destroy: "Coleção excluÃda com sucesso."
+ complaint:
+ create:
+ notice:
+ sucess: "Denúncia realizada com sucesso."
+ alert:
+ failure: "Este objeto já foi denunciado por você."
+ feedback:
+ report_bug:
+ notice:
+ sucess: "Problema relatado com sucesso!"
institution:
- name: "Nome"
+ create:
+ notice:
+ successfully_created: "Instituição criada com sucesso."
+ update:
+ notice:
+ sucessfully_updated: "Instituição atualizada com sucesso."
+ destroy:
+ notice:
+ successfully_destroy: "Instituição excluÃda com sucesso."
review:
create:
notice: