andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

fixes for design

Browse Source
This commit is contained in:
Andreas Stephanides
2019-04-01 06:47:49 +02:00
parent c5860f338b
commit 2f741d5893
23 changed files with 294 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/rubriken/index.html.erb
View File

@@ -11,18 +11,18 @@
<%= render 'tabs' %>
<p id="notice"><%= notice %></p>
<div class="content-wrap content-column">
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div class="container">
<div class="row">
<div class="col">
<h1><%= I18n.t("rubrik.title")%></h1>
</div>
</div>
<div class="row-fluid">
<div class="row">
<div class="span9">
<div class="col-md-9">
<ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
<ul class="list-unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
<% @neuigkeiten.each do |n| %>
<li><%= render n %> </li>
<% end %>
@@ -34,7 +34,7 @@
</div>
<% unless @calentries.nil? or @calentries.empty? or true%>
<div class="span3">
<div class="col-md-3">
<% unless @calentries.nil? or @calentries.empty? %>
<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>
<%= render 'calendars/calentries', :object=>@calentries %>

12
app/views/rubriken/show.html.erb
View File

@@ -17,8 +17,8 @@
<p id="notice"><%= notice %></p>
<div class="content-wrap content-column">
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div class="row">
<div class="col-md-12">
<h1><%= @rubrik.name %></h1>
<p>
@@ -31,10 +31,10 @@
<% end%>
</i>
</div></div>
<div class="row-fluid">
<div class="row">
<div class="span9">
<ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
<div class="col-md-9">
<ul class="list-unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
<% @neuigkeiten.each do |neuigkeit| %>
<%= render neuigkeit, wrap_in: "li" %>
<% end %>
@@ -46,7 +46,7 @@
</div>
</div>
<div class="span3">
<div class="col-md-3">
<% unless @calentries.nil? || @calentries.empty? %>
<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>
<%= render 'calendars/calentries', :object=>@calentries %>