Merge branch 'master' of ssh://51.254.143.84:9319/home/git/simple_crm

This commit is contained in:
Mini Robot 2018-02-03 21:55:47 +01:00
commit e1cb448943
1 changed files with 5 additions and 4 deletions

View File

@ -1,18 +1,19 @@
<header class="title"> <header class="title">
<div class="container"> <div class="container">
<h1><%= @page.title %></h1>
</div> </div>
</header> </header>
<% if @page.type_of != 2 %> <% if @page.type_of != 2 %>
<section> <section>
<div class="container"> <div class="container" style="border-left: 4px solid rgba(0,0,0,0.2); border-right: 1px solid rgba(0,0,0,0.2);">
<h1><%= @page.title %></h1>
<%= raw @page.full_text %> <%= raw @page.full_text %>
</div> </div>
</section> </section>
<% elsif @page.type_of == 2 && @page.article && !@page.article.published_page_articles.blank? %> <% elsif @page.type_of == 2 && @page.article && !@page.article.published_page_articles.blank? %>
<section> <section>
<div class="container"> <div class="container" style="border-left: 4px solid rgba(0,0,0,0.2); border-right: 1px solid rgba(0,0,0,0.2);">
<h1><%= @page.title %></h1>
<% for pas in @page.article.published_page_articles %> <% for pas in @page.article.published_page_articles %>
<div class="post-preview"> <div class="post-preview">
<a href="/site/<%= pas.friendly_id %>"> <a href="/site/<%= pas.friendly_id %>">