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

links überarbeitet

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-27 20:43:16 +02:00
parent 58a5802dac
commit 45908e6013
5 changed files with 69 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/stylesheets/application.css.scss
View File

@@ -12,6 +12,7 @@
*= require_tree .
*= require jquery.fileupload-ui
* require 'bootstrap'
*/
$linkColor: #03006E;
@@ -55,4 +56,4 @@ border-style: solid;
border-width: 1px 0px 0px 0px;
border-color: grey;
min-width: 100%;
}
}

7
app/views/fetprofiles/index.html.erb
View File

@@ -17,16 +17,17 @@
</div>
<% @fetprofiles.each do |fetprofile| %>
<div class="row-fluid">
<%= link_to fetprofile do %>
<div class="span3">
<%= image_tag fetprofile.picture.portrait.url %>
</div>
<div class="span9">
<h2><%= link_to fetprofile.name, fetprofile %></h2>
<h2><%= fetprofile.name %></h2>
<p><%= fetprofile.fetmail %></p>
<p><%= fetprofile.desc %></p>
<p><%= fetprofile.active %> </p>
</div>
</div> <% end %>
</div>
<% end %>
<div class="row-fluid">

42
app/views/galleries/index.html.erb
View File

@@ -1,26 +1,28 @@
<h1>Listing galleries</h1>
<table>
<tr>
<th>Name</th>
<th>Desc</th>
<th>Datum</th>
<th></th>
<th></th>
<th></th>
</tr>
<% @galleries.each do |gallery| %>
<tr>
<td><%= gallery.name %></td>
<td><%= gallery.desc %></td>
<td><%= gallery.datum %></td>
<td><%= link_to 'Show', gallery %></td>
<td><%= link_to 'Edit', edit_gallery_path(gallery) %></td>
<td><%= link_to 'Destroy', gallery, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</table>
<%= %>
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<% @galleries.each do |gallery| %>
<%= link_to gallery do %>
<div class="media">
<div class="pull-left" href="#">
<%= image_tag gallery.fotos.first.datei.big_thumb.url %>
</div>
<div class="media-body">
<h1><%= gallery.datum %> - <%= gallery.name %></h1>
<p><%= gallery.desc %>
</p>
</div>
</div>
<% end %>
<%= link_to 'Edit', edit_gallery_path(gallery) %>
<% end %>
</div>
</div>
</div
<br />

55
app/views/gremien/show.html.erb
View File

@@ -1,20 +1,41 @@
<p id="notice"><%= notice %></p>
<%= render 'fetprofiles/tabs' %>
<h1>
<%= @gremium.name %>
</h1>
<p>
<%= @gremium.desc %>
</p>
<% @gremium.memberships.order(:typ).active.each do |m| %>
<%= image_tag m.fetprofile.picture.portrait %>
<%= m.fetprofile.name + " ist" + render(m) %>
<% end %>
<p>
<%= Gremium::TYPEN[@gremium.typ.to_i].to_s %>
</p>
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<%= render 'fetprofiles/tabs' %>
<p id="notice"><%= notice %></p>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<h1>
<%= @gremium.name %>
</h1>
<% Gremium::TYPEN[@gremium.typ.to_i].to_s %>
<p>
<%= @gremium.desc %>
</p>
</div>
</div>
<%= link_to 'Edit', edit_gremium_path(@gremium) %> |
<% @gremium.memberships.order(:typ).active.each_slice(4) do |r| %>
<div class="row-fluid"><% r.each do |m| %>
<%= link_to m.fetprofile do %>
<div class="span3" style="vertical-align:middle; text-align:center">
<%= image_tag m.fetprofile.picture.portrait %>
<p>
<%= m.fetprofile.name %> <br><%= render(m) %>
</p>
</div>
<% end %>
<% end %>
</div>
<% end %>
<%= link_to 'Edit', edit_gremium_path(@gremium) %> |
</div>
</div>
</div>

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

@@ -1,15 +1,15 @@
<%= link_to 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><%= link_to neuigkeit.title,neuigkeit_path(neuigkeit) %></h1>
<h1><%= neuigkeit.title%></h1>
<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
<%= link_to "more" , neuigkeit_path(neuigkeit) %>
<p></p>
</div>
</div>
<% end %>