From 5439bc13feacd0a6c882041afe691eb61e393e21 Mon Sep 17 00:00:00 2001
From: Ina <inaloena@gmail.com>
Date: Thu, 1 Oct 2015 09:29:45 -0300
Subject: [PATCH] subject page
---
app/controllers/welcome_controller.rb | 2 +-
app/views/shared/application/_header.html.erb | 2 +-
.../{assuntos.html.erb => subject.html.erb} | 16 +++++++++++++++-
config/routes.rb | 2 +-
4 files changed, 18 insertions(+), 4 deletions(-)
rename app/views/welcome/{assuntos.html.erb => subject.html.erb} (75%)
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 2088cac9..e215b8d3 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -22,7 +22,7 @@ class WelcomeController < ApplicationController
def contact
end
- def assuntos
+ def subject
@general = []
mainPage = main_page_repository.all.first
@general = mainPage["highlights"].take(3).collect do |id|
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index 9b464a45..35dc29c0 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', assuntos_path %></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/assuntos.html.erb b/app/views/welcome/subject.html.erb
similarity index 75%
rename from app/views/welcome/assuntos.html.erb
rename to app/views/welcome/subject.html.erb
index 2f7ef60e..0dad2cc4 100644
--- a/app/views/welcome/assuntos.html.erb
+++ b/app/views/welcome/subject.html.erb
@@ -52,6 +52,20 @@
</div>
</div>
<div class="row mainpage-subjects">
- <h2>Adicionados Recentemente</h2>
+ <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/routes.rb b/config/routes.rb
index 43b69eda..06bc22b7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,6 +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 '/assuntos' => 'welcome#assuntos'
+ get '/subject/:id' => 'welcome#subject', as:'subject_index'
end
--
GitLab