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

design-tests1

Browse Source
This commit is contained in:
Andreas Stephanides
2013-09-06 00:33:12 +02:00
parent 9c316f165c
commit 12f426235f
6 changed files with 72 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/application.html.erb
View File

@@ -15,7 +15,7 @@
</head>
<body>
<div class="container-fluid">
<div id="maincontainer" class="container-fluid">
<div class="row-fluid">
<div class="header">
<h1 style="display:block;float:none">Fachschaft Elektrotechnik</h1>
@@ -24,7 +24,7 @@
<div class="row-fluid">
<div class="span2 earlymax">
<div id="menudiv"><%= render :template => 'layouts/menu' %></div>
</div> <div class="span10 earlymax">
</div> <div class="span10 earlymax" id="contentdiv">
<%= yield %>
</div>

2
app/views/layouts/menu.html.erb
View File

@@ -1,7 +1,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="#"><%= t 'home.mtitle'%></a>
<!-- <a class="brand" href="#"><% t 'home.mtitle'%></a>-->
<a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>

25
app/views/neuigkeiten/_neuigkeit.html.erb
View File

@@ -1,15 +1,18 @@
<%= link_to [neuigkeit.rubrik,neuigkeit] do %>
<div class="media">
<div class="pull-left" href="#">
<p><br><%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %></p>
</div>
<div class="media-body"><div><small><%= neuigkeit.rubrik.name %></small>
<small class="pull-right"><%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></small> </div>
<h1><%= neuigkeit.title%></h1>
<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
<p></p>
</div>
<div class="media neuigkeit_block">
<div class="pull-left" href="#">
<p><br><%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %>
</p>
</div>
<div class="media-body">
<div>
<small><%= neuigkeit.rubrik.name %></small>
<small class="pull-right"><%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></small>
</div>
<h1><%= neuigkeit.title%></h1>
<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
</div>
</div>
<br>
<% end %>