From 8080f12947de333822cce27f491943f1bcb9d307 Mon Sep 17 00:00:00 2001
From: Mauricio Giacomini Girardello <mauriciogiacomini4@gmail.com>
Date: Mon, 9 Nov 2015 15:04:24 -0200
Subject: [PATCH] just organize the routes code
---
app/views/welcome/collection.html.erb | 73 ---------------------------
config/routes.rb | 11 ++--
2 files changed, 4 insertions(+), 80 deletions(-)
delete mode 100644 app/views/welcome/collection.html.erb
diff --git a/app/views/welcome/collection.html.erb b/app/views/welcome/collection.html.erb
deleted file mode 100644
index c8d1afb5..00000000
--- a/app/views/welcome/collection.html.erb
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-<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/>
- <%= image_tag image_path("icons/square.png"), class: "logo-image",size: "20x20" %> 200 itens</ul>
- </div>
-</div>
-<br/></nav>
-<nav class="navigation navbar-inverse ">
- <div class="container-fluid">
- <a class="navbar-brand" href="#"><font color="FFFFFF">x arquivo(s) selecionado(s)</font></a>
- <ul class="nav navbar-nav navbar-right">
- <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>
-
-<div class="row mainpage-subjects">
- <br/>
- <div class="col-md-4">
- <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">
- <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">
- <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/config/routes.rb b/config/routes.rb
index 987b61e4..eedad418 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,9 +9,10 @@ Rails.application.routes.draw do
namespace :management do
root 'welcome#index'
-
resource :complaints
resources :institutions
+ resources :highlights
+ resources :carousels
resources :statistics do
collection do
@@ -31,13 +32,13 @@ Rails.application.routes.draw do
get :admins
end
end
- resources :highlights
- resources :carousels
mount Sidekiq::Web, at: '/sidekiq'
end
root 'welcome#index'
+ resources :subjects, only: [:index, :show]
+ resources :institutions
resources :learning_objects do
member do
@@ -47,7 +48,6 @@ Rails.application.routes.draw do
end
end
- resources :institutions
resources :collections do
member do
# add a learning object for some collection
@@ -58,9 +58,6 @@ Rails.application.routes.draw do
end
end
- resources :subjects, only: [:index, :show]
- #resources :complaints, only: [:create, :destroy]
-
resources :users, only: [:show] do
collection do
get :me
--
GitLab