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

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

@@ -1,36 +1,29 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<%= render 'fetprofiles/tabs' %>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<h1>
<%= I18n.t 'fetprofiles.all' if params[:filter] == "all" %>
<%= I18n.t 'fetprofiles.active' if params[:filter].nil? || params[:filter]== "active"
%>
</h1>
</div>
</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><%= fetprofile.name %></h2>
<p><%= fetprofile.fetmail %></p>
<p><%= fetprofile.desc %></p>
</div> <% end %>
<%= render 'fetprofiles/tabs' %>
<h1>
<%= I18n.t 'fetprofiles.all' if params[:filter] == "all" %>
<%= I18n.t 'fetprofiles.active' if params[:filter].nil? || params[:filter]== "active"
%>
</h1>
<ul class="unstyled">
<% @fetprofiles.each do |fetprofile| %>
<li>
<%= link_to fetprofile do %>
<span class="pull-left">
<%= image_tag fetprofile.picture.portrait.url %>
</span>
<div class="">
<h2><%= fetprofile.name %></h2>
<p><%= fetprofile.fetmail %></p>
<p><%= fetprofile.desc %></p>
</div>
<% end %>
</li>
<% end %>
</ul>
<div class="row-fluid">
<div class="span12">
<%= link_to 'New Fetprofile', new_fetprofile_path %>
<div class="span12">
<%= link_to I18n.t('fetprofiles.new'), new_fetprofile_path %>
</div></div></div>

56
app/views/fetprofiles/show.html.erb
View File

@@ -1,40 +1,40 @@
<p id="notice"><%= notice %></p>
<div class="container-fluid">
<div class="row-fluid">
<div class="span3">
<%= image_tag @fetprofile.picture.portrait.url %>
</div>
<div class="span9">
<h2><%= @fetprofile.name %></h2>
<div class="span3">
<%= image_tag @fetprofile.picture.portrait.url %>
</div>
<div class="span9">
<h2><%= @fetprofile.name %></h2>
<p>
<%= @fetprofile.fetmailalias %>
</p>
<p>
<%= @fetprofile.desc %>
</p>
<p>
<%= "<b>Aktiv</b>".html_safe if @fetprofile.active %>
</p>
<p><%= link_to 'Destroy', @fetprofile, method: :delete, data: { confirm: 'Are you sure?' } %></p>
</div>
</div>
<p>
<%= @fetprofile.fetmailalias %>
</p>
<p>
<%= @fetprofile.desc %>
</p>
<p>
<%= "<b>"+I18n.t('fetprofiles.active')+"</b>".html_safe if @fetprofile.active %>
</p>
<p><%= link_to 'Destroy', @fetprofile, method: :delete, data: { confirm: 'Are you sure?' } %></p>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<ul>
<div class="span12">
<ul>
<% @fetprofile.memberships.each do |m| %>
<li>
<%= render m %>
<% link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) %>
</li>
<li>
<%= render m %>
<% link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) %>
</li>
<% end %>
</ul>
</ul>
<%= link_to 'Neue Mitgliedschaft', new_fetprofile_membership_path(@fetprofile) %> |
<%= link_to 'Neue Mitgliedschaft', new_fetprofile_membership_path(@fetprofile) %> |
<%= link_to 'Edit', edit_fetprofile_path(@fetprofile) %> |
<%= link_to 'Back', fetprofiles_path %>
</div>
<%= link_to 'Edit', edit_fetprofile_path(@fetprofile) %> |
<%= link_to 'Back', fetprofiles_path %>
</div>
</div></div>