Skip to content
Snippets Groups Projects
Commit 01da0ae1 authored by Mauricio Giacomini Girardello's avatar Mauricio Giacomini Girardello
Browse files

moving application global views from welcome to shared partials folder

parent c83c07e6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 25 deletions
app/views/layouts/application.html.erb
+ 19
− 17
View file @ 01da0ae1
<!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">&times;</span></button>
<button type="button" class="close" data-dismiss="alert" aria-label="Fechar">
<span aria-hidden="true">&times;</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">&times;</span></button>
<button type="button" class="close" data-dismiss="alert" aria-label="Fechar">
<span aria-hidden="true">&times;</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>
app/views/shared/application/_header.html.erb
+ 14
− 8
View file @ 01da0ae1
......@@ -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&nbsp;<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&nbsp;<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&nbsp;<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&nbsp;<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&nbsp;<span class="caret"/></a></h3></li>
<li class="nav-button"><h3>
<a class="nav-dropdown" data-content="about" href="javascript:void(0);">Sobre&nbsp;<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">&times;</span></h3></a>
<a class="navigation-content-close pull-right" aria-label="Close" href="javascript:void(0);">
<h3><span aria-hidden="true">&times;</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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment