diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index fa2e1abfe2cbb1a83f18fa94066f136fdfe8444a..e53ee4ccaa186ea094228caa140b164220be0f88 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -84,7 +84,6 @@ header {
}
// barra brasil
-
.barra-brasil {
background: #F1F1F1;
height: 32px;
@@ -104,21 +103,19 @@ header {
background-color: #2178F5;
padding: 0px;
padding-top: 8px;
- margin: 0px;
+ margin: 10px auto auto auto;
// logo
.logo-container {
- text-align: left;
+ text-align: center;
}
.logo {
margin-top: 10px;
padding: 0;
text-align: center;
- float: left;
- width: 165px;
h3 {
margin-top: 10px;
- font-weight: 400;
+ font-weight: 100;
}
a {
color: #FFF;
@@ -130,16 +127,19 @@ header {
// accessibility
.search-accessibility {
margin-top: 25px;
- text-align: right;
+ //text-align: center;
img {
- height: 25px;
+ max-height: 25px;
+ height: auto;
}
}
// search
.search-input {
- margin-top: 40px;
- margin-bottom: 22px;
- text-align: right;
+ margin: 10px auto auto auto;
+ margin-bottom: 22px;
+ max-width: 500px;
+ width: auto;
+ text-align: center;
// text input
.form-control {
@@ -149,7 +149,8 @@ header {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
- height: 40px;
+ max-height: 40px;
+ height: auto;
padding-left: 20px;
font-size: 18px;
font-weight: 300 !important;
@@ -160,7 +161,8 @@ header {
border-top-right-radius: 7px;
.btn, .btn:focus, .btn:hover {
- height: 40px;
+ max-height: 40px;
+ height: auto;
font-size: 20px;
color: #FF2602;
background-color: #FFF;
@@ -176,7 +178,7 @@ header {
// user info
.status-text {
margin-top: 20px;
- // font-size: 20px;
+ font-size: 20px;
text-align: right;
h2, h4 {
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index c4d440da9d34846f709ee52d9c8e3f84655b7e88..bae9dc39134be3ddcefc4e8ba00997ccf6963478 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,10 +1,10 @@
class SearchController < ApplicationController
-
+
include LearningObjectsHelper
def index
- @types = LearningObject.object_types
+ #@types = LearningObject.object_types
@topics = Topic.defaults
@@ -23,7 +23,7 @@ class SearchController < ApplicationController
@result = Collection.search params[:query], where: {privacy: "public"}, order: col_order_hash(params), page: params[:page] || 1, per_page: 10
when "User"
@result = User.search params[:query], order: user_order_hash(params), page: params[:page] || 1, per_page: 10
- else
+ else
raise "Wrong search class parameter"
end
@@ -73,7 +73,7 @@ class SearchController < ApplicationController
hash["url"] = url_for([user, :only_path => false])
response << hash
end
- else
+ else
raise "Wrong search class parameter"
end
render json: response
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index 7b1d1363e660b456cf73e4391c2b67b20c5ce553..670465f410f2b47ca39af76eb00b348bdcf0bce7 100644
--- a/app/views/shared/application/_header.html.erb
+++ b/app/views/shared/application/_header.html.erb
@@ -19,40 +19,16 @@
<div class="search-bar">
<div class="container">
<div class="row">
- <div class="col-md-3 logo-container">
- <div class="logo">
- <%= link_to root_path do %>
- <%= image_tag image_path("logo.png"), class: "logo-image" %><br/>
- <h3>CONTEÚDO EDUCACIONAL</h3>
- <% end %>
- </div>
- </div>
- <div class="col-md-6">
- <div class="search-accessibility">
- <%= image_tag 'fonte_mais.png', onclick: 'fontSize.resizeText(1)' %>
- <%= image_tag 'fonte_inicial.png', onclick: 'fontSize.resizeText(0)' %>
- <%= image_tag 'fonte_menos.png', onclick: 'fontSize.resizeText(-1)' %>
- <%= image_tag 'contraste.png', onclick: 'contrast.change()' %>
+ <div class="col-md-12 status-text">
+ <div class="col-md-10">
+ <div class="search-accessibility">
+ <%= image_tag 'fonte_mais.png', onclick: 'fontSize.resizeText(1)' %>
+ <%= image_tag 'fonte_inicial.png', onclick: 'fontSize.resizeText(0)' %>
+ <%= image_tag 'fonte_menos.png', onclick: 'fontSize.resizeText(-1)' %>
+ <%= image_tag 'contraste.png', onclick: 'contrast.change()' %>
+ </div>
</div>
- <div class="search-input">
- <form action="/search" method="get">
- <div class="input-group" id="search">
- <input type="text" placeholder="buscar em <%= number_with_delimiter(LearningObject.count, delimiter: ".") %> objetos" class="form-control" name="query" id="main_search">
- <select name="search_class" id="search_class" class="form-control">
- <option value="LearningObject" selected>Objetos Educacionais</option>
- <option value="Collection">Coleções</option>
- <option value="User">Usuários</option>
- </select>
- <div class="input-group-btn">
- <button class="btn btn-default" type="submit"><i class="glyphicon glyphicon-search"></i></button>
- </div>
- </div>
- </form>
- </div>
- </div>
-
- <div class="col-md-3 status-text">
<% if user_signed_in? %>
<div class="media">
<div class="media-body">
@@ -74,6 +50,35 @@
</div>
<% end %>
</div>
+ <div class="col-md-11">
+ <div class="logo-container">
+ <div class="logo">
+ <%= link_to root_path do %>
+ <%= image_tag image_path("logo.png"), class: "logo-image" %><br/>
+ <h3>CONTEÚDO<br/>EDUCACIONAL</h3>
+ <% end %>
+ </div>
+ </div>
+ <div class="search-input">
+ <form action="/search" method="get">
+ <div class="input-group" id="search">
+ <input type="text" pl aceholder="buscar em <%= number_with_delimiter(LearningObject.count, delimiter: ".") %> objetos" class="form-control" name="query" id="main_search">
+ <select name="search_class" id="search_class" class="form-control">
+ <option value="LearningObject" selected>Objetos Educacionais</option>
+ <option value="Collection">Coleções</option>
+ <option value="User">Usuários</option>
+ </select>
+ <div class="input-group-btn">
+ <button class="btn btn-default" type="submit"><i class="glyphicon glyphicon-search"></i></button>
+ </div>
+ </div>
+ </form>
+ </div>
+
+ </div>
+
+
+
</div>
</div>
</div>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 160f1c29e2939063facc0af330136d906a32a326..313f595e29918a0a9be7747f147e9c41b25d13ad 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -61,7 +61,7 @@
<div class="col-md-12">
<% unless @highlights.blank? %>
<div class="row learning-object-columns">
- <h2>Destaque</h2>
+ <h2>Destaques</h2>
<% @highlights.each do |highlight| %>
<%= render highlight, orientation: 'vertical' %>
<% end %>