Fixes button colors

fga-eps-mds · Jun 24, 2017 · a9efe8e · a9efe8e
1 parent fdc4389
commit a9efe8e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 56 deletions.
diff --git a/.rake_tasks~ b/.rake_tasks~
diff --git a/:test b/:test
diff --git a/app/views/alumns/show.html.erb b/app/views/alumns/show.html.erb
@@ -14,14 +14,14 @@
  <%if is_principal? %>
  <%= link_to '<span class="fa fa-edit"></span> Editar'.html_safe, edit_alumn_path(@alumn), class:"btn btn-sm btn-default" %>
  <%= link_to '<span class="fa fa-times"></span> Excluir'.html_safe, "", method: :delete, class:'btn btn-sm btn-danger', data: { confirm: 'Tem certeza? Essa alteração não pode ser desfeita.' }, name:"delete" %>
- <%= link_to '<span class="fa fa-address-card"></span> Advertir'.html_safe, new_alumn_strike_path(@alumn), class:'btn btn-sm btn-strike' %>
- <%= link_to '<span class="fa fa-address-card"></span> Suspender'.html_safe, new_alumn_suspension_path(@alumn), class:'btn btn-sm btn-suspension' %>
+ <%= link_to '<span class="fa fa-address-card"></span> Advertir'.html_safe, new_alumn_strike_path(@alumn), class:'btn btn-sm btn-warning' %>
+ <%= link_to '<span class="fa fa-address-card"></span> Suspender'.html_safe, new_alumn_suspension_path(@alumn), class:'btn btn-sm btn-danger' %>
  <%end%>
  <%if @alumn.strikes.any?%>
- <%= link_to '<span class="fa fa-edit"></span"></span> Visualizar Advertências'.html_safe, alumn_strikes_path(@alumn), class:"btn btn-sm btn-strike-show" %>
+ <%= link_to '<span class="fa fa-edit"></span"></span> Visualizar Advertências'.html_safe, alumn_strikes_path(@alumn), class:"btn btn-sm btn-crown-of-thorns" %>
  <%end%>
  <%if @alumn.suspensions.any?%>
- <%= link_to '<span class="fa fa-edit"></span"></span> Visualizar Suspensões'.html_safe, alumn_suspensions_path(@alumn), class:"btn btn-sm btn-suspension-show" %>
+ <%= link_to '<span class="fa fa-edit"></span"></span> Visualizar Suspensões'.html_safe, alumn_suspensions_path(@alumn), class:"btn btn-sm btn-jacarta" %>
  <%end%>
  </div>
  <div class="row item">

diff --git a/app/views/parents/show.html.erb b/app/views/parents/show.html.erb
@@ -9,7 +9,7 @@
  <div class="pull-right">
  <%if is_principal? %>
  <%= link_to '<span class="fa fa-edit"></span>Editar'.html_safe, edit_parent_path(@parent), class:"btn btn-sm btn-default" %>
- <%= link_to 'Adicionar aluno', new_parent_alumn_path(@parent), class:"btn btn-sm btn-roxo"%>
+ <%= link_to 'Adicionar aluno', new_parent_alumn_path(@parent), class:"btn btn-sm btn-jacarta"%>
  <%= link_to '<span class="fa fa-times"></span>Excluir'.html_safe, "", method: :delete, class:'btn btn-sm btn-danger', data: { confirm: 'Tem certeza? Essa alteração não pode ser desfeita.'}, name:"delete" %>
  <%end%>
  </div>
@@ -22,7 +22,9 @@
  <h4 class="">Telefone: <%= @parent.phone %></h4>
  <h4 class="">Sexo: <%= @parent.gender %></h4>
  <h4 class="">Endereço: <%= @parent.address %></h4>
- <h4 class="">Data de Nascimento: <%= @parent.birth_date.strftime('%d/%m/%Y') %></h4>
+ <% unless @parent.birth_date.blank? %>
+ <h4 class="">Data de Nascimento: <%= @parent.birth_date.strftime('%d/%m/%Y') %></h4>
+ <% end%>
  <h4 class="">CPF: <%= @parent.parent_cpf %></h4>
  <% @parent.alumns.each do |alumn| %>
  <h4><%=link_to "Aluno: #{alumn.name}",alumn_path(alumn), class: "btn btn-default" %></h4>