From 24d81970ca40f8bd75b1b66d6b10985e0d9ec18d Mon Sep 17 00:00:00 2001
From: Mauricio Giacomini Girardello <mauriciogiacomini4@gmail.com>
Date: Fri, 16 Oct 2015 10:25:57 -0300
Subject: [PATCH] displaying welcome panel for only not logged users
---
app/views/welcome/index.html.erb | 127 ++++++++++++++++---------------
1 file changed, 67 insertions(+), 60 deletions(-)
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 5144ba23d..b1ab075a2 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -2,83 +2,90 @@
<div class="col-md-7">
<div class="row">
<% if @carousel.present? %>
- <div id="myCarousel" class="carousel slide" data-ride="carousel">
- <!-- Indicators -->
- <ol class="carousel-indicators">
- <% i = 0 %>
- <% @carousel.each do |highlight| %>
- <% if highlight == @carousel.first %>
- <li data-target="#myCarousel" data-slide-to="<%= i %>" class="active"></li>
- <% else %>
- <li data-target="#myCarousel" data-slide-to="<%= i %>"></li>
+ <div id="myCarousel" class="carousel slide" data-ride="carousel">
+ <!-- Indicators -->
+ <ol class="carousel-indicators">
+ <% i = 0 %>
+ <% @carousel.each do |highlight| %>
+ <% if highlight == @carousel.first %>
+ <li data-target="#myCarousel" data-slide-to="<%= i %>" class="active"></li>
+ <% else %>
+ <li data-target="#myCarousel" data-slide-to="<%= i %>"></li>
+ <% end %>
+ <% i+= 1 %>
<% end %>
- <% i+= 1 %>
- <% end %>
- </ol>
- <div class="carousel-inner" role="listbox">
- <% @carousel.each do |highlight|%>
- <% if highlight == @carousel.first %>
- <% highlight_class="item active" %>
- <% else %>
- <% highlight_class="item" %>
- <% end %>
- <div class="<%= highlight_class %>">
- <%= image_tag highlight.image.url(:larger) %>
- <div class="container">
- <div class="carousel-caption">
- <h1><%= link_to highlight.title, highlight.url, style: 'color: white;'%></h1>
+ </ol>
+ <div class="carousel-inner" role="listbox">
+ <% @carousel.each do |highlight| %>
+ <% if highlight == @carousel.first %>
+ <% highlight_class="item active" %>
+ <% else %>
+ <% highlight_class="item" %>
+ <% end %>
+ <div class="<%= highlight_class %>">
+ <%= image_tag highlight.image.url(:larger) %>
+ <div class="container">
+ <div class="carousel-caption">
+ <h1><%= link_to highlight.title, highlight.url, style: 'color: white;' %></h1>
- </div>
- </div>
+ </div>
+ </div>
+ </div>
+ <% end %>
</div>
- <% end %>
</div>
- </div>
<% end %>
</div>
<div class="row mainpage-highlights">
<% if @general.present? %>
- <ul class="list-unstyled">
- <h2>Destaques</h2>
- <%= render @general, orientation: 'horizontal' %>
- <% end %>
+ <ul class="list-unstyled">
+ <h2>Destaques</h2>
+ <%= render @general, orientation: 'horizontal' %>
+ <% end %>
</ul>
</div>
</div>
- <div class="col-md-3 col-md-offset-1 hidden-xs hidden-sm">
- <div class="panel-wrapper">
- <div style="padding: 30px; min-height: 400px">
- <h2>Cadastre-se!</h2><br>
- <h2>Vantagens de cadastrar:</h2><br>
- <h2>Faça suas coleções.</h2><br>
- <h2>Curta objetos.</h2><br>
- <h2>Tenha seus objetos favoritos.</h2><br>
- </div>
- <div style="width: 100%; padding: 30px;">
- <%= form_tag(new_user_registration_path, method: 'get') do %>
- <%= text_field_tag :email, '', placeholder: "Seu email", class: 'form-control'%>
- <%= button_to "Cadastrar-se", new_user_registration_path,class: "btn btn-danger", style: 'margin-top: 10px; width: 230px; background-color: #FF2134;'%>
- <% end %>
+
+ <% if !user_signed_in? %>
+ <div class="col-md-3 col-md-offset-1 hidden-xs hidden-sm">
+ <div class="panel-wrapper">
+ <div style="padding: 30px; min-height: 400px">
+ <h2>Cadastre-se!</h2><br>
+
+ <h2>Vantagens de cadastrar:</h2><br>
+
+ <h2>Faça suas coleções.</h2><br>
+
+ <h2>Curta objetos.</h2><br>
+
+ <h2>Tenha seus objetos favoritos.</h2><br>
+ </div>
+ <div style="width: 100%; padding: 30px;">
+ <%= form_tag(new_user_registration_path, method: 'get') do %>
+ <%= text_field_tag :email, '', placeholder: "Seu email", class: 'form-control' %>
+ <%= button_to "Cadastrar-se", new_user_registration_path, class: "btn btn-danger", style: 'margin-top: 10px; width: 230px; background-color: #FF2134;' %>
+ <% end %>
+ </div>
+ </div>
</div>
- </div>
- </div>
+ <% end %>
</div>
<div class="row mainpage-subjects">
<div class="col-md-12">
<% unless @subjects.blank? %>
- <div class="row learning-object-columns">
- <h2>Destaque por assunto</h2>
- <% @subjects.each do |subject|%>
- <div class="row mainpage-subject-element">
- <h4><b><%= subject.name %></b></h4>
- <%= render subject.highlights.first, orientation: 'vertical'%>
- <p class="more">
- <a href="#">Ver Mais</a>
- </p>
- </div>
- <% end %>
- </div>
+ <div class="row learning-object-columns">
+ <h2>Destaque por assunto</h2>
+ <% @subjects.each do |subject| %>
+ <div class="row mainpage-subject-element">
+ <h4><b><%= subject.name %></b></h4>
+ <%= render subject.highlights.first, orientation: 'vertical' %>
+ <p class="more">
+ <a href="#">Ver Mais</a>
+ </p>
+ </div>
+ <% end %>
+ </div>
<% end %>
</div>
</div>
--
GitLab