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

design und struktur (container - unnötige entfernt)

Browse Source
This commit is contained in:
Andreas Stephanides
2013-09-07 12:37:16 +02:00
parent 1c44ddc2ba
commit a60bdf5149
14 changed files with 137 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/views/neuigkeiten/index.html.erb
View File

@@ -1,27 +0,0 @@
<h1>Listing neuigkeiten</h1>
<table>
<tr>
<th>Title</th>
<th>Text</th>
<th>Datum</th>
<th></th>
<th></th>
<th></th>
</tr>
<% @neuigkeiten.each do |neuigkeit| %>
<tr>
<td><%= neuigkeit.title %></td>
<td><%= neuigkeit.text %></td>
<td><%= neuigkeit.datum %></td>
<td><%= link_to 'Show', neuigkeit %></td>
<td><%= link_to 'Edit', edit_neuigkeit_path(neuigkeit) %></td>
<td><%= link_to 'Destroy', neuigkeit, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</table>
<br />
<%= link_to 'New Neuigkeit', new_neuigkeit_path %>

45
app/views/neuigkeiten/show.html.erb
View File

@@ -1,32 +1,23 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<%= render 'rubriken/tabs' %>
<p id="notice"><%= notice %></p>
</div>
</div>
<div class="row-fluid">
<div class="span9">
<%= @neuigkeit.rubrik.name %>
</div>
<div class="span3">
<%= render 'rubriken/tabs' %>
<p id="notice"><%= notice %></p>
<%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>
<%= "am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %>
</div>
<span>
<%= @neuigkeit.rubrik.name %>
</span>
<span class="pull-right">
<%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>
<%= "am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %>
</span>
<div class="media">
<div class="pull-left" href="#">
<p><br><%= link_to image_tag(@neuigkeit.picture.big_thumb.url),@neuigkeit.picture.url %>
</p>
</div>
<div class="row-fluid">
<div class="span12">
<div class="media">
<div class="pull-left" href="#">
<p><br><%= link_to image_tag(@neuigkeit.picture.big_thumb.url),@neuigkeit.picture.url %></p>
</div>
<div class="media-body">
<h1><%= link_to @neuigkeit.title,rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit) %></h1>
<%= raw(@neuigkeit.text) %>
<p></p>
</div>
</div>
<div class="media-body">
<h1><%= link_to @neuigkeit.title,rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit) %></h1>
<%= raw(@neuigkeit.text) %>
<p></p>
</div>
</div>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>