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

fixed fetprofiles

Browse Source
This commit is contained in:
Andreas Stephanides
2013-09-24 10:00:13 +02:00
parent 5e06187a94
commit e884e82fa5
6 changed files with 66 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/views/fetprofiles/_tabs.html.erb
View File

@@ -1,24 +1,25 @@
<ul class="nav nav-tabs">
<li <%= (request.fullpath == fetprofiles_path(filter: "active")|| request.fullpath == fetprofiles_path) ? 'class="active"'.html_safe : ''%> >
<%= link_to "Aktive Mitglieder" , fetprofiles_path( filter: "active") %> </li>
<li><%= link_to "Alle Gremien und Gruppen", gremien_path %></li>
<% for g in @gremientabs %>
<li <%= (request.fullpath == fetprofiles_path(filter: "active")|| request.fullpath == fetprofiles_path) ? 'class="active"'.html_safe : ''%> >
<%= link_to "Aktive Mitglieder" , fetprofiles_path( filter: "active") %>
</li>
<li>
<%= link_to "Alle Gremien und Gruppen", gremien_path %>
</li>
<% for g in @gremientabs %>
<li <%= (!@gremium.nil? && g == @gremium) ? 'class="active"'.html_safe : '' %> title="<%= g.name %>">
<%= link_to g.name, g %>
</li>
<% end %>
<li <%= (request.fullpath == fetprofiles_path(filter: "all")) ? 'class="active"'.html_safe : ''%> >
<%= link_to "Alle Mitglieder" , fetprofiles_path( filter: "all") %> </li>
<% if can?(:verwalten,Gremium) %>
<% if request.fullpath == verwalten_gremien_path %>
</li>
<% end %>
<li <%= (request.fullpath == fetprofiles_path(filter: "all")) ? 'class="active"'.html_safe : ''%> >
<%= link_to "Alle Mitglieder" , fetprofiles_path( filter: "all") %>
</li>
<% if can?(:verwalten,Gremium) %>
<% if request.fullpath == verwalten_gremien_path %>
<li class="active pull-right">
<% else %>
<li class="pull-right">
<% end %>
<%= link_to "Verwaltung", verwalten_gremien_path %>
</li>
<% end %>
<% end %>
<%= link_to "Verwaltung", verwalten_gremien_path %>
</li>
<% end %>
</ul>

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

@@ -6,26 +6,27 @@
%>
</h1>
<ul class="unstyled fetprofile_list">
<% @fetprofiles.each do |fetprofile| %>
<li>
<%= link_to fetprofile do %>
<div class="media">
<span class="pull-left">
<%= image_tag fetprofile.picture.portrait.url %>
</span>
<div class="media-body">
<% @fetprofiles.each do |fetprofile| %>
<li>
<%= link_to fetprofile do %>
<div class="media">
<span class="pull-left">
<%= image_tag fetprofile.picture.portrait.url %>
</span>
<div class="media-body">
<h2><%= fetprofile.name %></h2>
<p><%= fetprofile.fetmail %></p>
<p><%= fetprofile.desc %></p>
<h2><%= fetprofile.name %></h2>
<p><%= fetprofile.fetmail %></p>
<p><%= fetprofile.desc %></p>
</div>
</div>
<% end %>
</li>
<% end %>
</div>
</div>
<% end %>
</li>
<% end %>
</ul>
<div class="row-fluid">
<div class="span12">
<%= link_to I18n.t('fetprofiles.new'), new_fetprofile_path %>
</div></div></div>
</div>
</div>
</div>

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

@@ -6,7 +6,6 @@
</div>
<div class="span9">
<h2><%= @fetprofile.name %></h2>
<p>
<%= @fetprofile.fetmailalias %>
</p>
@@ -14,9 +13,8 @@
<%= @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>
<%= link_to 'Destroy', @fetprofile, method: :delete, data: { confirm: 'Are you sure?' } %>
</p>
</div>
</div>
@@ -26,15 +24,11 @@
<% @fetprofile.memberships.each do |m| %>
<li>
<%= render m %>
<% link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) %>
<%= link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"]%>
<%= link_to 'delete', [@fetprofile, m], method: :delete, data: {confirm: 'Sure?'} if params["verwalten"] %>
</li>
<% end %>
</ul>
<%= link_to 'Neue Mitgliedschaft', new_fetprofile_membership_path(@fetprofile) %> |
<%= link_to 'Edit', edit_fetprofile_path(@fetprofile) %> |
<%= link_to 'Back', fetprofiles_path %>
<%= render 'layouts/pretty_toolbar' %>
</div>
</div></div>

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

@@ -16,10 +16,14 @@
<% 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>
<%= image_tag m.fetprofile.try(:picture).try(:portrait) %>
<p>
<% if m.fetprofile.nil?%>
PROFIL fehlt
<% else %>
<%= m.fetprofile.name %> <br>
<%= render(m) %>
<% end %>
</p>
</div>
<% end %>

20
app/views/gremien/verwalten.html.erb
View File

@@ -5,15 +5,25 @@
<div class="span2">
<%= gremium.typ %>
</div>
<div class="span18">
<div class="span8">
<b><%= gremium.name %></b>
<%= gremium.desc %>
</div>
<div span="2">
<%= link_to 'Show', gremium %>
<%= link_to 'Edit', edit_gremium_path(gremium) %>
<%= link_to 'Destroy', gremium, method: :delete, data: { confirm: 'Are you sure?' } %>
<div class="span2">
<div class="btn-group">
<%= link_to 'Show', gremium,{:class=>"btn"} %>
<button class="btn dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li>
<%= link_to 'Show', gremium %></li>
<li> <%= link_to 'Edit', edit_gremium_path(gremium) %></li>
<li> <%= link_to 'Destroy', gremium, method: :delete, data: { confirm: 'Are you sure?' }, class:"btn-danger" %>
</li> </ul>
</div>
</div>
</div>
<% end %>
</div>