diff --git "a/app/assets/images/icons/Copiar_Sele\303\247\303\243o.png" "b/app/assets/images/icons/Copiar_Sele\303\247\303\243o.png"
new file mode 100644
index 0000000000000000000000000000000000000000..85d33052a55cdd834c30b1c632172bf7ccaab8d3
Binary files /dev/null and "b/app/assets/images/icons/Copiar_Sele\303\247\303\243o.png" differ
diff --git a/app/assets/images/icons/Download_01.png b/app/assets/images/icons/Download_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..367358d049e9c2c6b5f841e459923a4f7b26b6e2
Binary files /dev/null and b/app/assets/images/icons/Download_01.png differ
diff --git "a/app/assets/images/icons/Mover_Sele\303\247\303\243o.png" "b/app/assets/images/icons/Mover_Sele\303\247\303\243o.png"
new file mode 100644
index 0000000000000000000000000000000000000000..27feb4a46143bcede48aaa0b9a45e0283ce78015
Binary files /dev/null and "b/app/assets/images/icons/Mover_Sele\303\247\303\243o.png" differ
diff --git "a/app/assets/images/icons/Remover_da_Cole\303\247\303\243o_Sele\303\247\303\243o.png" "b/app/assets/images/icons/Remover_da_Cole\303\247\303\243o_Sele\303\247\303\243o.png"
new file mode 100644
index 0000000000000000000000000000000000000000..bda86e5ce3e7cfc86c866645bd26aa0e633b2ca3
Binary files /dev/null and "b/app/assets/images/icons/Remover_da_Cole\303\247\303\243o_Sele\303\247\303\243o.png" differ
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index da0932409ccef44723ef69222f3fbaac64d43482..7a07a7eb57b2693f6c7e35ada39d33630ac01d7a 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -218,7 +218,7 @@ header {
}
.divider {
width: 2px;
- margin-left: 3px;
+ margin-left: 3px;
height: 100%;
background-color: #FFF;
}
@@ -390,9 +390,16 @@ table.tipo1 p{ font-size: 15px; font-weight: bold; }
}
.right-edge { padding: 0px 45px; }
-.left-edge { position: relative; top: 30px; }
+.left-edge {
+ position:absolute;
+ left: -35px;
+ }
-.left-edge { left: 0px; }
+ .set-align {
+ position: relative;
+ margin: 5px;
+ padding: 0px 35px;
+ }
.right-button { padding: 0px 60px; }
@@ -437,8 +444,7 @@ border-radius: 4px;
.thumb{
width:250px;
- float: left;
- margin-left: 5px;
+ margin-left: 50px;
border: solid 1px #ccc;
}
input.chk{
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index 35dc29c0f5f689ca721751e64d7099b7eb8c0c2f..3a3a50fe50a94c47af23db810d374d086df3dcca 100644
--- a/app/views/shared/application/_header.html.erb
+++ b/app/views/shared/application/_header.html.erb
@@ -120,30 +120,30 @@
úteis <span class="caret"/></a>
<ul class="dropdown-menu">
<li>
- <div class="row" style="width: 400px;">
+ <div class="row" style="width: 620px;">
<ul class="list-unstyled col-md-6 col-md-offset-1">
<li><b>Portais nacionais e internacionais</b></li>
<li role="separator" class="divider"></li>
- <li><a href="">Portais Educacionais</a></li>
- <li><a href="">Museus</a></li>
- <li><a href="">Bibliotecas</a></li>
- <li><a href="">Revistas</a></li>
- <li><a href="">Projetos Inovadores</a></li>
- <li><a href="">Jornais</a></li>
- <li><a href="">Projeto de escolas</a></li>
- <li><a href="">Um computador por aluno</a></li>
- <li><a href="">Geoprocessamento</a></li>
- <li><a href="">Prêmio Professores do Brasil</a></li>
- <li><a href="">Capacitação ProInfo Integrado</a></li>
+ <li>•<a href="">Portais Educacionais</a></li>
+ <li>•<a href="">Museus</a></li>
+ <li>•<a href="">Bibliotecas</a></li>
+ <li>•<a href="">Revistas</a></li>
+ <li>•<a href="">Projetos Inovadores</a></li>
+ <li>•<a href="">Jornais</a></li>
+ <li>•<a href="">Projeto de escolas</a></li>
+ <li>•<a href="">Um computador por aluno</a></li>
+ <li>•<a href="">Geoprocessamento</a></li>
+ <li>•<a href="">Prêmio Professores do Brasil</a></li>
+ <li>•<a href="">Capacitação ProInfo Integrado</a></li>
</ul>
<ul class="list-unstyled col-md-5">
<li><b>Visite também</b></li>
<li role="separator" class="divider"></li>
- <li><a href="">DomÃnio Público</a></li>
- <li><a href="">E-ProInfo</a></li>
- <li><a href="">Objetos Educacionais</a></li>
- <li><a href="">Plataforma Freire</a></li>
- <li><a href="">TV Escola</a></li>
+ <li>•<a href="">DomÃnio Público</a></li>
+ <li>•<a href="">E-ProInfo</a></li>
+ <li>•<a href="">Objetos Educacionais</a></li>
+ <li>•<a href="">Plataforma Freire</a></li>
+ <li>•<a href="">TV Escola</a></li>
</ul>
</div>
</li>
diff --git a/app/views/welcome/collection.html.erb b/app/views/welcome/collection.html.erb
index b08d37bf1c5567c5915c79e6fa552463b500de42..c8d1afb594127908b3cd8312488fa5bb4113aab2 100644
--- a/app/views/welcome/collection.html.erb
+++ b/app/views/welcome/collection.html.erb
@@ -2,6 +2,11 @@
<nav class="navigation navbar-default "><br/>
<div class="container-fluid">
+ <div class="navbar-right">
+ <%= link_to 'http://www.fnde.gov.br/' do %>
+ <%= image_tag 'icons/collection-download.png', style: 'width: auto; height: 40px; margin-right: 20px;' %><span style="margin-right: 30px;"><button class="but but-shadow but-rc">Editar Coleção</button></span>
+ <% end %>
+ </div>
<div class="navbar-header">
<%= image_tag image_path("icons/collection.png"), class: "logo-image",size: "90x66" %>
<ul class="nav navbar-nav navbar-right"><h1> <b>Coleção 1</b></h1> <br/>
@@ -11,12 +16,12 @@
<br/></nav>
<nav class="navigation navbar-inverse ">
<div class="container-fluid">
- <a class="navbar-brand" href="#">x arquivo(s) selecionado(s)</a>
+ <a class="navbar-brand" href="#"><font color="FFFFFF">x arquivo(s) selecionado(s)</font></a>
<ul class="nav navbar-nav navbar-right">
- <li><a href="#"><span class="left-edge"><%= image_tag image_path("icons/collection1.png"), class: "logo-image",size: "35x28" %></span> Salvar no <br>computador</br></a></li>
- <li><a href="#"><span class="left-edge"><%= image_tag image_path("icons/collection1.png"), class: "logo-image",size: "35x28" %></span> Copiar <br>para</br></a></li>
- <li><a href="#"><span class="left-edge"><%= image_tag image_path("icons/collection1.png"), class: "logo-image",size: "35x28" %></span> Mover <br>para</br></a></li>
- <li><a href="#"><span class="left-edge"><%= image_tag image_path("icons/collection1.png"), class: "logo-image",size: "35x28" %></span> Remover da <br>coleção</br> </a></li>
+ <li class="set-align"><a href="#"><span class="left-edge"><%= image_tag image_path("icons/Download_01.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Salvar no <br>computador</font></br></a></li>
+ <li class="set-align"><a href="#"><span class="left-edge"><%= image_tag image_path("icons/Copiar_Seleção.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Copiar <br>para</font></br></a></li>
+ <li class="set-align"><a href="#"><span class="left-edge"><%= image_tag image_path("icons/Mover_Seleção.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Mover <br>para</font></br></a></li>
+ <li class="set-align"><a href="#"><span class="left-edge"><%= image_tag image_path("icons/Remover_da_Coleção_Seleção.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Remover da <br>coleção</font></br></a></li>
</ul>
</div>
</nav>
@@ -24,18 +29,45 @@
<div class="row mainpage-subjects">
<br/>
<div class="col-md-4">
- Obj 1<br/>
- Obj 4<br/>
- Obj 7
+ <div class="thumb">
+ <input type="checkbox" class="chk " checked="checked" name="" value="0" />
+ <%= image_tag image_path('learning-object-preview.png'), class: "logo" %>Obj1
+ </div><br/>
+ <div class="thumb">
+ <input type="checkbox" class="chk " checked="checked" name="" value="0" />
+ <%= image_tag image_path('learning-object-preview.png'), class: "logo" %>Obj4
+ </div><br/>
+ <div class="thumb">
+ <input type="checkbox" class="chk " checked="checked" name="" value="0" />
+ <%= image_tag image_path('learning-object-preview.png'), class: "logo" %>Obj7
+ </div>
</div>
<div class="col-md-4">
- Obj 2<br/>
- Obj 5<br/>
- Obj 8
+ <div class="thumb">
+ <input type="checkbox" class="chk " checked="checked" name="" value="0" />
+ <%= image_tag image_path('learning-object-preview.png'), class: "logo" %>Obj2
+ </div><br/>
+ <div class="thumb">
+ <input type="checkbox" class="chk " checked="checked" name="" value="0" />
+ <%= image_tag image_path('learning-object-preview.png'), class: "logo" %>Obj5
+ </div><br/>
+ <div class="thumb">
+ <input type="checkbox" class="chk " checked="checked" name="" value="0" />
+ <%= image_tag image_path('learning-object-preview.png'), class: "logo" %>Obj8
+ </div>
</div>
<div class="col-md-4">
- Obj 3<br/>
- Obj 6<br/>
- Obj 9
+ <div class="thumb">
+ <input type="checkbox" class="chk " checked="checked" name="" value="0" />
+ <%= image_tag image_path('learning-object-preview.png'), class: "logo" %>Obj3
+ </div><br/>
+ <div class="thumb">
+ <input type="checkbox" class="chk " checked="checked" name="" value="0" />
+ <%= image_tag image_path('learning-object-preview.png'), class: "logo" %>Obj6
+ </div><br/>
+ <div class="thumb">
+ <input type="checkbox" class="chk " checked="checked" name="" value="0" />
+ <%= image_tag image_path('learning-object-preview.png'), class: "logo" %>Obj9
+ </div>
</div>
</div>
diff --git a/app/views/welcome/follow_collection.html.erb b/app/views/welcome/follow_collection.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..6c5de8d58cf8e62f83328dbd4b976bbf53eff687
--- /dev/null
+++ b/app/views/welcome/follow_collection.html.erb
@@ -0,0 +1,17 @@
+<!--Página que o usuário pode seguir uma coleção -->
+
+<nav class="navigation navbar-default "><br/>
+<div class="container-fluid">
+ <div class="navbar-right">
+ <%= link_to 'http://www.fnde.gov.br/' do %>
+ <%= image_tag 'icons/collection-download.png', style: 'width: auto; height: 40px; margin-right: 20px;' %>
+ <span style="margin-right: 30px;"><button class="but but-shadow but-rc">Seguir Coleção</button></span>
+ <% end %>
+ </div>
+ <div class="navbar-header">
+ <%= image_tag image_path("icons/collection.png"), class: "logo-image",size: "90x66" %>
+ <ul class="nav navbar-nav navbar-right"><h1> <b>Coleção 1</b></h1> <br/>
+ <%= image_tag image_path("user-anon.png"), class: "logo-image",size: "30x30" %> por Usuário</ul>
+ <!--ul class="nav navbar-nav navbar-right">200 itens</ul-->
+ </div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
index c47237ea52191f89c19986fb43c69e6d3afcb449..59ee91d38329e0b1f116cee81c44ba100e1b98b4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,4 +58,5 @@ Rails.application.routes.draw do
get '/subject/:id' => 'welcome#subject', as:'subject_index'
get '/collection' => 'welcome#collection'
get '/signup' => 'welcome#signup'
+ get '/follow_collection' => 'welcome#follow_collection'
end