Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into better-blog-post

This commit is contained in:
Lorin Werthen 2016-11-01 21:52:51 +01:00
commit 9f81fe1036
No known key found for this signature in database
GPG key ID: F11FFC921E0E08E0
3 changed files with 46 additions and 46 deletions

View file

@ -31,6 +31,7 @@ dl {
.padbox {
margin-bottom:10px;
border-radius: 0 !important;
}
.blogwidth{

View file

@ -10,6 +10,8 @@
// Sticky footer
body.site {
overflow-x: hidden;
display: flex;
min-height: 100vh;
flex-direction: column;

View file

@ -1,55 +1,52 @@
<div class="columns" >
<div class="column is-2 is-narrow">
<aside class="menu">
<p class="menu-label">
Academic Year
</p>
<ul class="menu-list">
<% academic_years_items.each do |year, item| %>
<% if @item_rep && @item_rep.path == item.path %>
<li>
<a href="#" class="is-active">
<%= pretty_year(year) %>
</a>
</li>
<% else %>
<li>
<%= link_to pretty_year(year), item %>
</li>
<% end %>
<% end %>
</ul>
</aside>
<div class="column is-2 is-narrow">
<aside class="menu">
<p class="menu-label">
Academic Year
</p>
<ul class="menu-list">
<% academic_years_items.each do |year, item| %>
<% if @item_rep && @item_rep.path == item.path %>
<li>
<a href="#" class="is-active">
<%= pretty_year(year) %>
</a>
</li>
<% else %>
<li>
<%= link_to pretty_year(year), item %>
</li>
<% end %>
<% end %>
</ul>
</aside>
</div>
<div class="column">
<% posts_in_year(item[:academic_year]).each do |post| %>
<% posts_in_year(item[:academic_year]).each do |post| %>
<a href="<%= relative_path_to(post) %>">
<article class="box padbox">
<article class="box padbox">
<div class="columns">
<div class="column">
<p class="title is-3"><%= post[:title] %></p>
<p class="subtitle is-5"><% if post[:author] %>
<% if post[:lang] == :en %>
by
<% else %>
door
<% end %>
<%= post[:author] %>
<% end %></p>
<div class="content">
<%= post[:description] %>
<br>
<small><%= post[:created_at] %></small>
</div>
</div>
<div class="column">
<div class="column">
<p class="title is-3"><%= post[:title] %></p>
<p class="subtitle is-5">
<% if post[:author] %>
by <%= post[:author] %>
<% end %>
</p>
<div class="content">
<%= excerptize(post.reps[:text].compiled_content, length: 200).tr("\n", ' ')%>
<%= post[:description] %>
<br>
<small><%= post[:created_at] %></small>
</div>
</div>
<div class="column">
<div class="content">
<%= excerptize(post.reps[:text].compiled_content, length: 200).tr("\n", ' ')%>
</div>
</div>
</div>
</div>
</article>
</article>
</a>
<% end %>
</div>
</div>
<% end %>
</div>
</div>