diff --git a/app/assets/images/icons/Upload.png b/app/assets/images/icons/Upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..53aaf2819f22059cb7443ee82c6c370f19567a4b
Binary files /dev/null and b/app/assets/images/icons/Upload.png differ
diff --git a/app/assets/images/icons/btn_add.png b/app/assets/images/icons/btn_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfb53a0140d0ebe64b50277f61d339837d0fc94f
Binary files /dev/null and b/app/assets/images/icons/btn_add.png differ
diff --git a/app/assets/images/icons/btn_add_down.png b/app/assets/images/icons/btn_add_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c2151e580e276b86eb1776db15a6ffd1c103289
Binary files /dev/null and b/app/assets/images/icons/btn_add_down.png differ
diff --git a/app/assets/images/icons/btn_add_nobg.png b/app/assets/images/icons/btn_add_nobg.png
new file mode 100644
index 0000000000000000000000000000000000000000..58d29d7c9d30a2cae1dce48374ecd614aadaff06
Binary files /dev/null and b/app/assets/images/icons/btn_add_nobg.png differ
diff --git a/app/assets/images/icons/btn_dislike_comentario_down.png b/app/assets/images/icons/btn_dislike_comentario_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d12422fdb6dac42479db4822764f7cde89c6aca
Binary files /dev/null and b/app/assets/images/icons/btn_dislike_comentario_down.png differ
diff --git a/app/assets/images/icons/btn_dislike_comentario_up.png b/app/assets/images/icons/btn_dislike_comentario_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ac67bd2254b2847f8fcdd5e87417f599ff6c95a
Binary files /dev/null and b/app/assets/images/icons/btn_dislike_comentario_up.png differ
diff --git a/app/assets/images/icons/btn_like_comentario_down.png b/app/assets/images/icons/btn_like_comentario_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..c62e6ac90e86b5f7458426b96fb2f9c506b01adc
Binary files /dev/null and b/app/assets/images/icons/btn_like_comentario_down.png differ
diff --git a/app/assets/images/icons/btn_like_comentario_up.png b/app/assets/images/icons/btn_like_comentario_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..f95e9f8c2693ee63a91b9ab56787e90161a26d38
Binary files /dev/null and b/app/assets/images/icons/btn_like_comentario_up.png differ
diff --git a/app/assets/images/icons/btn_like_down.png b/app/assets/images/icons/btn_like_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..f14fdd3848c88ed1eead5f6da82771e06bc68d11
Binary files /dev/null and b/app/assets/images/icons/btn_like_down.png differ
diff --git a/app/assets/images/icons/btn_like_nobg.png b/app/assets/images/icons/btn_like_nobg.png
new file mode 100644
index 0000000000000000000000000000000000000000..50c050eedc340f906da184f8456a3812be97bc3a
Binary files /dev/null and b/app/assets/images/icons/btn_like_nobg.png differ
diff --git a/app/assets/images/icons/btn_like_up.png b/app/assets/images/icons/btn_like_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8db3af1ee8117f1c2ccbb1df46b581f57b32e79
Binary files /dev/null and b/app/assets/images/icons/btn_like_up.png differ
diff --git a/app/assets/images/icons/btn_report_comentario_down.png b/app/assets/images/icons/btn_report_comentario_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..80b6a352d6f56ea0280bc531856b3aab657522c0
Binary files /dev/null and b/app/assets/images/icons/btn_report_comentario_down.png differ
diff --git a/app/assets/images/icons/btn_report_comentario_up.png b/app/assets/images/icons/btn_report_comentario_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..a88d32e3afe9c593dc304169466daed6215373bf
Binary files /dev/null and b/app/assets/images/icons/btn_report_comentario_up.png differ
diff --git a/app/assets/images/icons/btn_report_down.png b/app/assets/images/icons/btn_report_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5b66a28836d404f4468660739e5174987082864
Binary files /dev/null and b/app/assets/images/icons/btn_report_down.png differ
diff --git a/app/assets/images/icons/btn_report_nobg.png b/app/assets/images/icons/btn_report_nobg.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a012884e7a1e600d6b93e977570229a93990672
Binary files /dev/null and b/app/assets/images/icons/btn_report_nobg.png differ
diff --git a/app/assets/images/icons/btn_report_up.png b/app/assets/images/icons/btn_report_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..52c2839e2bbaeba6418c45e99e3d48bb3d7a606f
Binary files /dev/null and b/app/assets/images/icons/btn_report_up.png differ
diff --git a/app/assets/images/icons/i_estilizado.png b/app/assets/images/icons/i_estilizado.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a84c7209bc7e70ca956a7a52a2e01e0d71919aa
Binary files /dev/null and b/app/assets/images/icons/i_estilizado.png differ
diff --git a/app/assets/images/icons/icone_download.png b/app/assets/images/icons/icone_download.png
new file mode 100644
index 0000000000000000000000000000000000000000..b12921cfabed7c0138fc62bf104b25f88df7fd76
Binary files /dev/null and b/app/assets/images/icons/icone_download.png differ
diff --git a/app/assets/images/icons/likes_counter.png b/app/assets/images/icons/likes_counter.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebf6b203d6145e5f24433586ff247594865a8f13
Binary files /dev/null and b/app/assets/images/icons/likes_counter.png differ
diff --git a/app/assets/javascripts/application/learning_objects.coffee.erb b/app/assets/javascripts/application/learning_objects.coffee.erb
index aff6150bc575ba8429c9df41023542d815781089..f779bd083637c826be3530312658df519b6fb91d 100644
--- a/app/assets/javascripts/application/learning_objects.coffee.erb
+++ b/app/assets/javascripts/application/learning_objects.coffee.erb
@@ -2,10 +2,10 @@ $ ->
$(document).on 'ajax:success', 'a.vote', (status, data, xhr) ->
$('.votes-count[data-id=\'' + data.id + '\']').text data.count
if $('.vote img').attr('alt') == 'Descurtir'
- $('.vote img').attr('src',"<%= image_path('icons/Curtir_01.png') %>")
+ $('.vote img').attr('src',"<%= image_path('icons/btn_like_down.png') %>")
$('.vote img').attr('alt', 'Curtir')
else if $('.vote img').attr('alt') == 'Curtir'
- $('.vote img').attr('src',"<%= image_path('icons/Curtir_02.png') %>")
+ $('.vote img').attr('src',"<%= image_path('icons/btn_like_up.png') %>")
$('.vote img').attr('alt', 'Descurtir')
return
return
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 5eba39571b242f0b39a6a24de47422bcfbb5f817..06b298aef5652569787c6bab0a74eac984c4e35a 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -236,10 +236,9 @@ header {
}
.nav-button {
- min-width: 20px;
+ min-width: 30px;
height: 100%;
- padding-left: 10px;
- //padding-right: 5px;
+ padding-right: 5px;
color: #343D3E;
font-weight: 500 !important;
@@ -1044,17 +1043,13 @@ input.chk {
margin-bottom: 1px;
}
-.send-new-item{
- position: relative;
- padding-left: 30px;
-}
-.send-new-item:after{
- content: '\f093';
- font-family: fontAwesome;
- font-size: inherit;
- color: #2178F5;
- /*color: #2078F3;*/
+.send-new-item img{
+ float: left;
position: absolute;
- left: 0;
- top: 0;
+ bottom: 5px;
+}
+
+.send-new-item h3{
+ position: relative;
+ padding-left: 20px;
}
diff --git a/app/assets/stylesheets/application/learning_objects.scss b/app/assets/stylesheets/application/learning_objects.scss
index 865ecb787ee56fb3ee4b58f4bfe719d16d9fcd95..17cdf3e2cefec37e6f3a0ec8bb02ae064327c341 100644
--- a/app/assets/stylesheets/application/learning_objects.scss
+++ b/app/assets/stylesheets/application/learning_objects.scss
@@ -145,27 +145,49 @@ $checked_icon: 'icons/checked.png';
.rightbar {
margin-top: 100px;
+ .panel-default{
+ margin-top: 10px;
+ background-color: #ECECEC;
+ border-color: #D1CECF;
+ border-bottom-right-radius: 10px;
+ border-top-right-radius: 10px;
+ border-bottom-left-radius: 10px;
+ border-top-left-radius: 10px;
+ padding: 18px 18px 18px 18px;
+ h3{
+ font-weight: 400;
+ font-size: 30px;
+ }
+ h4{
+ margin-top: 15px;
+ font-weight: 400;
+ font-size: 20px;
+ }
+ #toggle_metadata{
+ background-color: #F4F4F4;
+ color: #5D5D5D;
+ border-color: #D1D0D1;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ border-radius: 12px;
+ margin-top: 8px;
+ }
+ }
.media-heading {
white-space: nowrap;
}
.rating-panel {
width: 100%;
height: 100px;
- padding-top: 60px;
- h4{
+ .login-info img{
+ float: left;
+ }
+
+ .login-info h4{
position: relative;
padding-left: 40px;
}
- h4:after{
- content: '\f05a';
- font-family: fontAwesome;
- font-size: 2em;
- color: #FFC300;
- position: absolute;
- left: 0;
- top: 0;
- }
.rating {
text-align: right;
@@ -173,21 +195,48 @@ $checked_icon: 'icons/checked.png';
}
.actions {
- text-align: center;
.action {
- margin-top: 10px;
- padding: 0;
+ height: 50px;
+ width: 50px;
+ display: inline;
+
+ .btn-primary{
+ border-color: #CBC9CA;
+ background-color: #EEEEED;
+ }
+
+ .btn-success{
+ border-color: #C7E7F9;
+ background-color: #5FB761;
+ }
a {
- color: #F05421;
font-weight: 400;
}
- img {
- width: 40px;
- height: 40px;
+ img{
+ width: 20px;
+ height: 20px;
margin-bottom: 5px;
+ margin-top: 5px;
+ }
+ .share{
+ i{
+ padding-top: 4px;
+ color: #818080;
+ width: 20px;
+ height: 20px;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ }
}
+
+ .download{
+ line-height: 35px;
+ width: 160px;
+ height: 46px;
+ }
+
}
.action-like {
a {
diff --git a/app/views/complaints/_complaints_button.html.erb b/app/views/complaints/_complaints_button.html.erb
index 914ac3f7b89960cc0b0e3608ff78ac4a83538f27..d64a323bcbc5bbbc5d13d090666356492fa71d72 100644
--- a/app/views/complaints/_complaints_button.html.erb
+++ b/app/views/complaints/_complaints_button.html.erb
@@ -1,5 +1,4 @@
-<a type="button" class="add_to_complaint" data-toggle="modal" data-target="#complaints_list_modal" title="Denunciar Objeto">
- <%= image_tag "icons/report-circle.png", alt: "Denunciar objeto" %>
- <h6 style="color: #F05A28">denunciar objeto</h6>
+<a type="button" class="add_to_complaint btn btn-primary" data-toggle="modal" data-target="#complaints_list_modal" title="Denunciar Objeto">
+ <%= image_tag "icons/btn_report_up.png", alt: "Denunciar objeto" %>
</a>
<%= render 'complaints/form' %>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 7d7d9612f27dbfa9054cfdc62b04f31c1cd8cefc..86430a9afa5b1a673fd7c4b169c6508f0b4e59e9 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -23,11 +23,11 @@
<div class="col-md-10">
<div style="text-align:left">
Senha Atual: <%= f.password_field :current_password, autocomplete: "off" ,class:'input-width-setup1' %><br/>
- <span class="pull-right">
+ <!--span class="pull-right">
<div style="margin-bottom: 5px">
- <%= link_to 'Esqueci a senha', 'search_path', :class=>'link-setup'%>
+ <%#= link_to 'Esqueci a senha', 'password/new', :class=>'link-setup'%>
</div>
- </span><br/>
+ </span><br/-->
<%= f.text_field :name, autofocus: true, required: true, class:'input-setup-name top-padding-setup' %>
<!-- <input type="text" size="55" placeholder="Nome instituição"> -->
</div>
diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb
index f622d11612241948d1ae775c2b9d43e57a3b6cdb..5ffae9548083ec41045cf363017a0a7804ce0c2a 100644
--- a/app/views/learning_objects/show.html.erb
+++ b/app/views/learning_objects/show.html.erb
@@ -20,6 +20,8 @@
<% end %>
<span class="category"><%= ("Em " + show_categories(@learning_object.categories)) unless @learning_object.categories.nil? %></span>
</div>
+
+
<div class="col-md-5">
<div class="rightbar">
<% author = @learning_object.get_metadata_value_of("dc.contributor.author") %>
@@ -30,7 +32,7 @@
</div>
<div class="media-body">
<h5>Autor</h5>
- <h3 class="media-heading"><%= author %></h3>
+ <h3 style="font-family:bolder"><%= author %></h3>
</div>
</div>
<% end %>
@@ -46,45 +48,53 @@
</div>
</div>
<% end %>
+ <div class="panel panel-default">
+ <h3>Detalhes do Objeto</h3>
+ <h4>NÃvel Escolar:</h4>
+ <h5><%= @learning_object.topics.first.name%></h5>
+ <h4>Assunto:</h4>
+ <h5><%= @learning_object.topics.last.name%></h5>
+
+ <h5><a class="btn btn-primary" type="button" id="toggle_metadata" data-toggle="modal" data-target=".bs-example-modal-lg" title="Metadados Adicionais">Ver Metadados Adicionais</a></h5>
+ </div>
<div class="rating-panel">
<% if user_signed_in? %>
<div class="actions">
- <div class="col-sm-2 action">
- <%= link_to like_learning_object_path(id: @learning_object.id), class: 'vote',method: :post, remote: true do %>
+ <div class="action download">
+ <%= link_to download_learning_object_path, class: 'download btn btn-success', target: "_blank" do %>
+ <i class="fa fa-download"></i>FAZER DOWNLOAD
+ <%end%>
+ </div>
+ <div class="action">
+ <%= link_to like_learning_object_path(id: @learning_object.id), class: 'vote btn btn-primary',method: :post, remote: true do %>
<% if @liked %>
- <%= image_tag "icons/Curtir_02.png", alt: "Descurtir" %>
+ <%= image_tag "icons/btn_like_up.png", alt: "Descurtir" %>
<% else %>
- <%= image_tag "icons/Curtir_01.png", alt: "Curtir" %>
+ <%= image_tag "icons/btn_like_down.png", alt: "Curtir" %>
<% end %>
- <h6>curtir objeto</h6>
<% end %>
</div>
- <div class="col-sm-2 action">
- <%= link_to download_learning_object_path, target: "_blank" do %>
- <%#= @learning_object.retrieve_link %>
- <%= image_tag "icons/download.png", alt: "Download do objeto" %>
- <h6>salvar no computador</h6>
- <%end%>
+ <div class="action">
+ <a tabindex="0" class="add-to-collection btn btn-primary" role="button" title="Adicionar as coleções" data-loid="<%= @learning_object.id %>">
+ <%= image_tag "icons/btn_add.png", alt: "Adicionar à coleção" %>
+ </a>
</div>
- <div class="col-sm-2 action">
- <a tabindex="0" class="add-to-collection" role="button" title="Adicionar as coleções" data-loid="<%= @learning_object.id %>">
- <%= image_tag "icons/collection-add.png", alt: "Adicionar à coleção" %>
- <h6>adicionar à coleção</h6>
- </a>
- </div>
- <div class="col-sm-2 action">
+ <div class="action">
<%= render 'complaints/complaints_button' %>
</div>
- <div class="col-sm-2 action">
- <a tabindex="1" role="button" title="Compartilhar" data-toggle="modal" data-target="#share_modal">
- <%= image_tag "icons/collection-add.png", alt: "Compartilhar" %>
- <h6>Compartilhar</h6>
+ <div class="action">
+ <a tabindex="1" class="btn btn-primary share" role="button" title="Compartilhar" data-toggle="modal" data-target="#share_modal">
+ <i class="fa fa-share"></i>
+ <%#= image_tag "icons/collection-add.png", alt: "Compartilhar" %>
</a>
<%= render 'share_modal' %>
</div>
</div>
<% else %>
- <h4>Logue-se para poder curtir, adicionar o objeto em uma coleção, baixar o counteúdo ou denunciar.</h4>
+ <div class="login-info">
+ <%= image_tag "icons/i_estilizado.png"%>
+ <h4>Logue-se para poder curtir, adicionar o objeto em uma coleção, baixar o counteúdo ou denunciar.</h4>
+ </div>
<% end %>
</div>
</div>
@@ -92,7 +102,7 @@
</div>
<br/>
-<a class="btn btn-primary" type="button" data-toggle="modal" data-target=".bs-example-modal-lg" title="Metadados Adicionais">Metadados Adicionais</a>
+
<div class="modal fade bs-example-modal-lg" id="extra_metadata_modal" tabindex="-1" role="dialog" aria-labelledby="extra_metadata_modal_label">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index e27d2ee5ac573ac42251f5f9376ae2075f104057..aa086f578e73e9d095fb578b9d2e8f0ccd129853 100644
--- a/app/views/shared/application/_header.html.erb
+++ b/app/views/shared/application/_header.html.erb
@@ -82,7 +82,10 @@
<li role="separator" class="divider"></li>
<li class="nav-button">
<%= link_to new_learning_object_path do %>
- <h3 class="send-new-item">Enviar Novo Item</h3>
+ <div class="send-new-item">
+ <%= image_tag "icons/Upload.png"%>
+ <h3>Enviar Novo Item</h3>
+ </div>
<% end %>
</li>
<li role="separator" class="divider"></li>
diff --git a/app/views/shared/application/_home.html.erb b/app/views/shared/application/_home.html.erb
index 57705480ec6b9287a0291c22ebc454214eff765e..68ac0003d1c2a4b3fe5a3bab0bf2791e8dd5e2d4 100644
--- a/app/views/shared/application/_home.html.erb
+++ b/app/views/shared/application/_home.html.erb
@@ -22,7 +22,7 @@
<nav class="navigation" id="menu-bar">
<ul class="nav navbar-nav">
<li class="nav-button"><h3><a class="nav-dropdown" data-content="collections"><%= link_to 'Coleções Institucionais', collections_path %> </a></h3></li>
- <li class="dropdown nav-button"><h3><%= link_to 'Links Úteis', links_path %> </h3></li>
+ <li class="nav-button"><h3><%= link_to 'Links Úteis', links_path %> </h3></li>
<li class="nav-button"><h3><%= link_to 'Sobre', about_path %></a></h3></li> </h3></li>
<li class="nav-button"><h3><%= link_to "Enviar Novo Item", new_learning_object_path, style: "color: #FFFFFF" %></h3></li>
</ul>