From 01da0ae1774e5b680c379276f5136525d10d8e81 Mon Sep 17 00:00:00 2001
From: Mauricio Giacomini Girardello <mauriciogiacomini4@gmail.com>
Date: Thu, 8 Oct 2015 10:50:05 -0300
Subject: [PATCH] moving application global views from welcome to shared
partials folder
---
app/views/layouts/application.html.erb | 36 ++++++++++---------
.../application}/_about.html.erb | 0
.../application}/_contact.html.erb | 0
.../application}/_educational_level.html.erb | 0
.../application}/_faq.html.erb | 0
app/views/shared/application/_header.html.erb | 22 +++++++-----
.../application}/_links.html.erb | 0
7 files changed, 33 insertions(+), 25 deletions(-)
rename app/views/{welcome => shared/application}/_about.html.erb (100%)
rename app/views/{welcome => shared/application}/_contact.html.erb (100%)
rename app/views/{welcome => shared/application}/_educational_level.html.erb (100%)
rename app/views/{welcome => shared/application}/_faq.html.erb (100%)
rename app/views/{welcome => shared/application}/_links.html.erb (100%)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2505498c9..0b1b153b9 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,40 +1,42 @@
<!DOCTYPE html>
<html>
<head>
- <title>PortalMEC</title>
- <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+ <title>PortalMEC</title>
+ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
<link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700' rel='stylesheet' type='text/css'>
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
<meta property="creator.productor" content="http://estruturaorganizacional.dados.gov.br/id/unidade-organizacional/1">
</head>
<body>
- <%= render 'shared/application/header' %>
+<%= render 'shared/application/header' %>
- <% if user_signed_in? %>
- <%= render 'learning_objects/add_to_collection_popover', collections: @user_collections %>
- <% end %>
+<% if user_signed_in? %>
+ <%= render 'learning_objects/add_to_collection_popover', collections: @user_collections %>
+<% end %>
- <div class="container">
- <% if notice %>
+<div class="container">
+ <% if notice %>
<div class="alert alert-info" role="alert">
- <button type="button" class="close" data-dismiss="alert" aria-label="Fechar"><span aria-hidden="true">×</span></button>
+ <button type="button" class="close" data-dismiss="alert" aria-label="Fechar">
+ <span aria-hidden="true">×</span></button>
<%= notice %>
</div>
- <% end %>
+ <% end %>
- <% if alert %>
+ <% if alert %>
<div class="alert alert-danger alert-dismissible" role="alert">
- <button type="button" class="close" data-dismiss="alert" aria-label="Fechar"><span aria-hidden="true">×</span></button>
+ <button type="button" class="close" data-dismiss="alert" aria-label="Fechar">
+ <span aria-hidden="true">×</span></button>
<%= alert %>
</div>
- <% end %>
+ <% end %>
- <%= yield %>
- </div>
+ <%= yield %>
+</div>
- <%= render 'shared/application/footer' %>
+<%= render 'shared/application/footer' %>
- <script defer="defer" src="//barra.brasil.gov.br/barra.js" type="text/javascript"></script>
+<script defer="defer" src="//barra.brasil.gov.br/barra.js" type="text/javascript"></script>
</body>
</html>
diff --git a/app/views/welcome/_about.html.erb b/app/views/shared/application/_about.html.erb
similarity index 100%
rename from app/views/welcome/_about.html.erb
rename to app/views/shared/application/_about.html.erb
diff --git a/app/views/welcome/_contact.html.erb b/app/views/shared/application/_contact.html.erb
similarity index 100%
rename from app/views/welcome/_contact.html.erb
rename to app/views/shared/application/_contact.html.erb
diff --git a/app/views/welcome/_educational_level.html.erb b/app/views/shared/application/_educational_level.html.erb
similarity index 100%
rename from app/views/welcome/_educational_level.html.erb
rename to app/views/shared/application/_educational_level.html.erb
diff --git a/app/views/welcome/_faq.html.erb b/app/views/shared/application/_faq.html.erb
similarity index 100%
rename from app/views/welcome/_faq.html.erb
rename to app/views/shared/application/_faq.html.erb
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index 259b87d39..d9d89a8c3 100644
--- a/app/views/shared/application/_header.html.erb
+++ b/app/views/shared/application/_header.html.erb
@@ -78,13 +78,18 @@
<div class="container">
<div class="row">
<ul class="nav navbar-nav">
- <li class="nav-button nav-button-first"><h3><%= link_to 'Assuntos', subject_index_path(1) %></h3></li>
+ <li class="nav-button nav-button-first"><h3><%= link_to 'Assuntos', subject_path(id: 1) %></h3></li>
<li role="separator" class="divider"></li>
- <li class="dropdown nav-button"><h3><a class="nav-dropdown" data-content="educational-level" href="javascript:void(0);">NÃveis de Ensino <span class="caret"/></a></h3></li>
+ <li class="dropdown nav-button"><h3>
+ <a class="nav-dropdown" data-content="educational-level" href="javascript:void(0);">NÃveis de
+ Ensino <span class="caret"/></a></h3></li>
<li role="separator" class="divider"></li>
- <li class="dropdown nav-button"><h3><a class="nav-dropdown" data-content="links" href="javascript:void(0);">Links úteis <span class="caret"/></a></h3></li>
+ <li class="dropdown nav-button"><h3><a class="nav-dropdown" data-content="links" href="javascript:void(0);">Links
+ úteis <span class="caret"/></a></h3></li>
<li role="separator" class="divider"></li>
- <li class="nav-button"><h3><a class="nav-dropdown" data-content="about" href="javascript:void(0);">Sobre <span class="caret"/></a></h3></li>
+ <li class="nav-button"><h3>
+ <a class="nav-dropdown" data-content="about" href="javascript:void(0);">Sobre <span class="caret"/></a>
+ </h3></li>
<li role="separator" class="divider"></li>
</ul>
</div>
@@ -93,16 +98,17 @@
<div class="navigation-content">
<div class="container">
<div class="row">
- <a class="navigation-content-close pull-right" aria-label="Close" href="javascript:void(0);"><h3><span aria-hidden="true">×</span></h3></a>
+ <a class="navigation-content-close pull-right" aria-label="Close" href="javascript:void(0);">
+ <h3><span aria-hidden="true">×</span></h3></a>
</div>
<div class="navigation-content-educational-level">
- <%= render 'welcome/educational_level' %>
+ <%= render 'shared/application/educational_level' %>
</div>
<div class="navigation-content-links">
- <%= render 'welcome/links' %>
+ <%= render 'shared/application/links' %>
</div>
<div class="navigation-content-about">
- <%= render 'welcome/about' %>
+ <%= render 'shared/application/about' %>
</div>
</div>
</div>
diff --git a/app/views/welcome/_links.html.erb b/app/views/shared/application/_links.html.erb
similarity index 100%
rename from app/views/welcome/_links.html.erb
rename to app/views/shared/application/_links.html.erb
--
GitLab