diff --git a/app/assets/images/icons/Curtir_01.png b/app/assets/images/icons/Curtir_01.png new file mode 100644 index 0000000000000000000000000000000000000000..3d737cb427e80fc295a36f5fd845db1ca9df722e Binary files /dev/null and b/app/assets/images/icons/Curtir_01.png differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 2994715eff8149838cb342ba9fde7f7b9a3a8c5b..4d15ff7a789ec8f8ecaf08165f69a2ae93c40feb 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -446,6 +446,9 @@ table.tipo1 p { background-color: black; } } + .navigation-content{ + background-color: black; + } } .menu-bar-contrast { diff --git a/app/assets/stylesheets/application/learning_objects.scss b/app/assets/stylesheets/application/learning_objects.scss index aab528ad8693eafa35f64d6b3a89ae26af4d3307..38bbd922f6323895b4395884afe7f5905f939afa 100644 --- a/app/assets/stylesheets/application/learning_objects.scss +++ b/app/assets/stylesheets/application/learning_objects.scss @@ -157,6 +157,17 @@ $checked_icon: 'icons/checked.png'; margin-bottom: 5px; } } + .action-like { + a { + color: #F05421; + font-weight: 400; + } + img { + width: 70px; + height: 70px; + margin-bottom: 3px; + } + } } } } @@ -205,4 +216,4 @@ $checked_icon: 'icons/checked.png'; } } } -} \ No newline at end of file +} diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb index 3531f30e8b308f461beb8fe03cf1ffdf540051d9..6d0809473f9fe3c6d36aa7af460cd00551087e77 100644 --- a/app/views/learning_objects/show.html.erb +++ b/app/views/learning_objects/show.html.erb @@ -59,39 +59,25 @@ </div> </div> <div class="rating-panel"> - <p>O que você achou deste arquivo?</p> - <div class="rating"> - <span class="starRating"> - <input id="rating5" name="rating" type="radio" value="5"> - <label for="rating5">5</label> - <input id="rating4" name="rating" type="radio" value="4"> - <label for="rating4">4</label> - <input checked id="rating3" name="rating" type="radio" value="3"> - <label for="rating3">3</label> - <input id="rating2" name="rating" type="radio" value="2"> - <label for="rating2">2</label> - <input id="rating1" name="rating" type="radio" value="1"> - <label for="rating1">1</label> - </span> - </div> - </div> - <div class="actions"> - <div class="col-md-3 action"> - <a href="<%= @learning_object.get_retrievelink %>"> - <%= image_tag "icons/download.png", alt: "Download do objeto" %> - <h6>salvar no computador</h6> - </a> - </div> - <div class="col-md-3 action"> - <%= image_tag "icons/collection-add.png", alt: "Adicionar à coleção" %> - <h6>adicionar à coleção</h6> - </div> - <div class="col-md-3 action"></div> - <div class="col-md-3 action"> - - - <%= render "complaints/complaints_button" %> - <h6>denunciar objeto</h6> + <div class="actions"> + <div class="col-md-3 action-like"> + <%= image_tag "icons/Curtir_01.png", alt: "Curtir" %> + <h6>curtir objeto</h6> + </div> + <div class="col-md-3 action"> + <a href="<%= @learning_object.get_retrievelink %>"> + <%= image_tag "icons/download.png", alt: "Download do objeto" %> + <h6>salvar no computador</h6> + </a> + </div> + <div class="col-md-3 action"> + <%= image_tag "icons/collection-add.png", alt: "Adicionar à coleção" %> + <h6>adicionar à coleção</h6> + </div> + <div class="col-md-3 action"> + <%= render "complaints/complaints_button" %> + <h6>denunciar objeto</h6> + </div> </div> </div> </div> @@ -170,7 +156,7 @@ like_learning_object_path(@learning_object.id_dspace), method: :post, remote: true %> <% end %> - <br/> + <!-- <br/> <div class="row"> <div class="col-md-12"> <h1>Comentários</h1> @@ -233,12 +219,12 @@ <a class="btn btn-primary" href="#">Ver mais...</a> </center> </div> - </div> + </div>--> <br/> </div> <!--arquivos relacionados--> - <div class="col-sm-5"> +<!-- <div class="col-sm-5"> <div class="row"> <div class="col-md-12" style ="text-align:center"> <h1> @@ -270,7 +256,7 @@ </div> </div><hr> <%# end %> - </div> +</div>--> </div> <br/> </div> diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index ee0767735fb68983bb581ba7a1a1c9630ecd7a3a..5cf543e33b5dc52199a769a7507c530bab70c99b 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -1,6 +1,6 @@ <%= content_for(:body_attributes) do %> data-no-turbolink <% end %> <div class="row"> - <div class="col-sm-4 search-sidebar" id="menu-left"> + <div class="col-sm-3 search-sidebar" id="menu-left"> <!-- <h2>Busca Avançada</h2> --> <div class="media filters"> <div class="media-left"> @@ -283,7 +283,7 @@ </div> <!-- fim div class="nestedAccordion"--> - <div class="nestedAccordion"> + <!-- <div class="nestedAccordion"> <h3 class="dropdown">Ano de Publicação<span class="caret caret-align-right"/></h3> <div class="dropdown-element"> <form id="filter-year"> @@ -326,12 +326,12 @@ </table> </div> </form> - </div> + </div>--> </div> <!--/span col sm-4--> <!-- search results --> - <div class="col-sm-8"> + <div class="col-sm-9"> <div class="result-bar"> <form method="get"> <input type="hidden" name="qry" value="<%= params["qry"] %>"> diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb index 25db09f33b879f5f1645971db1889e46778b588d..be610d6a4f2306a0d6721e7d6c5531d3c6fbcfe9 100644 --- a/app/views/shared/application/_header.html.erb +++ b/app/views/shared/application/_header.html.erb @@ -81,12 +81,12 @@ <div class="container"> <div class="row"> <ul class="nav navbar-nav"> - <li class="nav-button nav-button-first"><h3><%= link_to 'Assuntos', subject_path(id: 1) %></h3></li> + <!-- <li class="nav-button nav-button-first"><h3><%= link_to 'Assuntos', subject_path(id: 1) %></h3></li> <li role="separator" class="divider"></li> <li class="dropdown nav-button"><h3> <a class="nav-dropdown" data-content="educational-level" href="javascript:void(0);">NÃveis de Ensino <span class="caret"/></a></h3></li> - <li role="separator" class="divider"></li> + <li role="separator" class="divider"></li>--> <li class="dropdown nav-button"><h3><a class="nav-dropdown" data-content="links" href="javascript:void(0);">Links úteis <span class="caret"/></a></h3></li> <li role="separator" class="divider"></li> @@ -103,10 +103,10 @@ <div class="row"> <a class="navigation-content-close pull-right" aria-label="Close" href="javascript:void(0);"> <h3><span aria-hidden="true">×</span></h3></a> - </div> + </div><!-- <div class="navigation-content-educational-level"> <%= render 'shared/application/educational_level' %> - </div> + </div>--> <div class="navigation-content-links"> <%= render 'shared/application/links' %> </div> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index ec78f89123af9257191199aea5d2f19752e8b5cc..5fbbfea8f526cfecef3852fa6c6058e7949cb285 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -70,7 +70,7 @@ <div class="col-md-12"> <% unless @subjects.blank? %> <div class="row learning-object-columns"> - <h2>Destaque por assunto</h2> + <h2>Destaque</h2> <% @subjects.each do |subject| %> <div class="row mainpage-subject-element"> <h4><b><%= subject.name %></b></h4>