diff --git a/Gemfile b/Gemfile
index 29da7ec04cb75a8c6af123515cedcb4de986e7a8..d95a4f75fff728bc354262a3d958d33b7931ff63 100644
--- a/Gemfile
+++ b/Gemfile
@@ -55,8 +55,8 @@ gem 'bootstrap-sass'
gem 'select2-rails'
#Gruff (graphs and charts)
-gem 'rmagick'
-gem 'gruff'
+#gem 'rmagick'
+#gem 'gruff'
#RSolr - Search Engine used by DSpace
gem "rsolr", "~> 1.0.12"
diff --git a/Gemfile.lock b/Gemfile.lock
index fa471b640c1824b760b023818689a0817feba11f..765382ed3bc8ad16dbd697d149d422150f343c21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -163,8 +163,6 @@ GEM
sexp_processor (~> 4.4)
globalid (0.3.6)
activesupport (>= 4.1.0)
- gruff (0.6.0)
- rmagick (>= 2.13.4)
hitimes (1.2.3)
http-cookie (1.0.2)
domain_name (~> 0.5)
@@ -270,7 +268,6 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
- rmagick (2.15.4)
rsolr (1.0.12)
builder (>= 2.1.2)
rspec-logsplit (0.1.3)
@@ -386,7 +383,6 @@ DEPENDENCIES
dspace_rest_client (~> 1.1.0)
execjs
flamegraph
- gruff
jbuilder (~> 2.0)
jquery-rails
jquery-turbolinks
@@ -401,7 +397,6 @@ DEPENDENCIES
rack-mini-profiler
rails (= 4.2.0)
rdoc
- rmagick
rsolr (~> 1.0.12)
rubycritic
sass-rails (~> 5.0)
@@ -421,6 +416,3 @@ DEPENDENCIES
uglifier (>= 1.3.0)
web-console (~> 2.0)
whenever
-
-BUNDLED WITH
- 1.10.6
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index bc02e96038e0189350f2a81f702119a8c34c8b10..e215b8d3aebb34f8d8a59ebda184995790fbcd02 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -22,4 +22,12 @@ class WelcomeController < ApplicationController
def contact
end
+ def subject
+ @general = []
+ mainPage = main_page_repository.all.first
+ @general = mainPage["highlights"].take(3).collect do |id|
+ learning_object_repository.find(id)
+ end
+ end
+
end
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 725a4087f5fa0c981ee0eb7cde39beb8865b2914..6e69a709330cfcd40824e067aafad77f996fd964 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -189,55 +189,7 @@
</tr>
</table>
</div>
- <!-- <h3>Conteúdo - Tipo 2</h3>
- <div>
- <h4>MÃdia</h4>
- <div>
- <table>
- <tr>
- <td><input type="checkbox">Fotos</td>
- <td><input type="checkbox">Imagens</td>
- </tr>
- <tr>
- <td><input type="checkbox">VÃdeos</td>
- <td><input type="checkbox">Ãudio</td>
- </tr>
- <tr>
- <td><input type="checkbox">Apresentações MultimÃdia</td>
- <td><input type="checkbox">Apps</td>
- </tr>
- </table>
- </div>
- <h4>Textos</h4>
- <div>
- <table>
- <tr>
- <td><input type="checkbox">Anais</td>
- <td><input type="checkbox">Artigos Web</td>
- </tr>
- <tr>
- <td><input type="checkbox">CapÃtulos de Livros</td>
- <td><input type="checkbox">Dissertações</td>
- </tr>
- <tr>
- <td><input type="checkbox">Livros</td>
- <td><input type="checkbox">Monografias</td>
- </tr>
- <tr>
- <td><input type="checkbox">Periódicos</td>
- <td><input type="checkbox">Revistas</td>
- </tr>
- <tr>
- <td><input type="checkbox">Teses</td>
- <td></td>
- </tr>
- </table>
- </div>
- <h4>Outros</h4>
- <div>
- <input type="checkbox">Planos de Aula
- </div>
- </div> -->
+
<h3 class="dropdown">Ano escolar<span class="caret caret-align-right"/></h3>
<div class="dropdown-element">
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index 67fea159cc9d1ef9549a96c950fe118cfef3487d..bec9370de90c7be7f3d8d4b6ccf9e611a760d7d2 100644
--- a/app/views/shared/application/_header.html.erb
+++ b/app/views/shared/application/_header.html.erb
@@ -78,7 +78,7 @@
<div class="container">
<div class="row">
<ul class="nav navbar-nav">
- <li class="nav-button nav-button-first"><h3><%= link_to 'Assuntos' %></h3></li>
+ <li class="nav-button nav-button-first"><h3><%= link_to 'Assuntos', subject_index_path(1) %></h3></li>
<li role="separator" class="divider"></li>
<li class="dropdown nav-button">
<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0);">NÃveis de
diff --git a/app/views/welcome/subject.html.erb b/app/views/welcome/subject.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..0dad2cc48fd5ad2217bdad401b754b4c96acc7e9
--- /dev/null
+++ b/app/views/welcome/subject.html.erb
@@ -0,0 +1,71 @@
+
+<div class="col-md-12">
+ <div class="row mainpage-subjects">
+ <div class="row mainpage-subjects">
+ <div class="col-md-12">
+ <% if @general.present? %>
+ <div class="row learning-object-columns">
+ <h2>Em Destaque</h2>
+ <% @general.each do |subject|%>
+ <div class="row mainpage-subject-element">
+ <%= render subject, orientation: 'vertical'%>
+
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ </div>
+ </div>
+ <div class="row mainpage-subjects">
+ <h2>Subtópicos</h2>
+ <div class="col-md-4">
+ Tópico 1<br/>
+ Tópico 4<br/>
+ Tópico 7
+ </div>
+ <div class="col-md-4">
+ Tópico 2<br/>
+ Tópico 5<br/>
+ Tópico 8
+ </div>
+ <div class="col-md-4">
+ Tópico 3<br/>
+ Tópico 6<br/>
+ Tópico 9
+ </div>
+ </div>
+
+ <div class="row mainpage-subjects">
+ <div class="col-md-12">
+ <% if @general.present? %>
+ <div class="row learning-object-columns">
+ <h2>Coleção de Matemática</h2>
+ <% @general.each do |subject|%>
+ <div class="row mainpage-subject-element">
+ <%= render subject, orientation: 'vertical'%>
+
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ </div>
+ <div class="row mainpage-subjects">
+ <div class="row mainpage-subjects">
+ <div class="col-md-12">
+ <% if @general.present? %>
+ <div class="row learning-object-columns">
+ <h2>Adicionados Recentemente</h2>
+ <% @general.each do |subject|%>
+ <div class="row mainpage-subject-element">
+ <%= render subject, orientation: 'vertical'%>
+
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/config/orientdb.yml b/config/orientdb.yml
index 07945002eacbdb755ce3058bf6ff217959fc76e8..aa6c0fde072d64ef1d79fa15ac3c03001b60f5d2 100644
--- a/config/orientdb.yml
+++ b/config/orientdb.yml
@@ -1,5 +1,5 @@
development: &development
- host: localhost
+ host: mecdb1.c3sl.ufpr.br
database: PortalMEC
username: admin
password: admin
diff --git a/config/routes.rb b/config/routes.rb
index c6a3fd5e87eceac3a43b311eaad7c568433ea6a8..06bc22b7b3213ea6918fa55d2cd228dc25c7b09a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,4 +55,6 @@ Rails.application.routes.draw do
get '/contact' => 'welcome#contact', as: 'contact'
get '/complaint' => 'welcome#complaint', as: 'complaint'
get '/search' => 'search#index', as: 'search'
+ get '/subject/:id' => 'welcome#subject', as:'subject_index'
+
end