From 9a2bf17e81e55383b4a1c234eea3b0b88d829eec Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Mon, 27 Oct 2014 15:40:12 +0100
Subject: [PATCH 1/2] fetprofile redesign

---
 app/views/fetprofiles/_landscape.html.erb | 19 ++++++++++++
 app/views/fetprofiles/_portrait.html.erb  |  9 ++++++
 app/views/fetprofiles/index.html.erb      | 36 ++++++++---------------
 app/views/fetprofiles/show.html.erb       |  4 +++
 app/views/gremien/show.html.erb           |  9 +++++-
 5 files changed, 52 insertions(+), 25 deletions(-)
 create mode 100644 app/views/fetprofiles/_landscape.html.erb
 create mode 100644 app/views/fetprofiles/_portrait.html.erb

diff --git a/app/views/fetprofiles/_landscape.html.erb b/app/views/fetprofiles/_landscape.html.erb
new file mode 100644
index 0000000..4385238
--- /dev/null
+++ b/app/views/fetprofiles/_landscape.html.erb
@@ -0,0 +1,19 @@
+ 
+    <div class="media">
+      
+      <span class="pull-left">
+	<%=  image_tag landscape.picture.portrait.url %>
+      </span>
+      
+      <div class="media-body">  
+	<h2><%= landscape.name %></h2>
+	
+	<p><%= landscape.fetmail %></p>
+	<% if false %>
+	<p><%= landscape.desc %></p>
+	<% end %>
+	
+      </div>
+      
+    </div>
+    
diff --git a/app/views/fetprofiles/_portrait.html.erb b/app/views/fetprofiles/_portrait.html.erb
new file mode 100644
index 0000000..2829791
--- /dev/null
+++ b/app/views/fetprofiles/_portrait.html.erb
@@ -0,0 +1,9 @@
+<div style="margin-left:auto; margin-right:auto;text-align:center"><%= image_tag portrait.try(:picture).try(:portrait) %>
+<br> <span>
+  <% if portrait.nil?%>
+  PROFIL fehlt
+  <% else %>
+  <%= portrait.name %>
+  <% end %>
+</span>
+    </div>
diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb
index 0bab083..22423e1 100644
--- a/app/views/fetprofiles/index.html.erb
+++ b/app/views/fetprofiles/index.html.erb
@@ -15,36 +15,24 @@
   </div>
 </div>
 
-<ul class="unstyled fetprofile_list linkbox-list" style="width:100%">
-  <% @fetprofiles.each do |fetprofile| %>
-
-<li>
-    <%= link_to fetprofile, {class: :linkbox} 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>
-<% if false %>
-	<p><%= fetprofile.desc %></p>
-<% end %>
+  <% @fetprofiles.each_slice(4) do |row| %>
+<div class="row-fluid">
+ <% row.each do |fetprofile| %>
+<div class="span3">
   
-      </div>
-
-    </div>
- 
+    <%= link_to fetprofile do %>
+    <%= render :partial=>"portrait", :object=>fetprofile %>
    <% end %>
-</li> 
- 
+  
+</div> 
   <% end %>
+</div>
+<% end %>
+
+
 
-</ul>
 
 
 <div class="row-fluid">
diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb
index 9b33949..5af8003 100644
--- a/app/views/fetprofiles/show.html.erb
+++ b/app/views/fetprofiles/show.html.erb
@@ -19,6 +19,9 @@
 
 
 <%= render 'fetprofiles/tabs' %>
+
+<div class="content-wrap content-column">
+
 <p id="notice"><%= notice %></p>
 <div style="max-width:70em">
   <div class="media">
@@ -48,3 +51,4 @@
   </div>
 </div>
       <%= render 'layouts/pretty_toolbar' %>
+</div>
diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb
index 3fca709..10ea53e 100644
--- a/app/views/gremien/show.html.erb
+++ b/app/views/gremien/show.html.erb
@@ -1,6 +1,9 @@
 <%= render 'fetprofiles/tabs' %>
+<div class="content-wrap content-column">
+
 <p id="notice"><%= notice %></p>
 <div class="content-wrap content-column">
+  <%= link_to I18n.t('common.edit'), edit_gremium_path(@gremium) if can? :edit, @gremium%> 
 <div class="container-fluid">
   <div class="row-fluid">
     <h1>
@@ -33,6 +36,9 @@
 	<%= render(m) %>
 	<% end %>
       </p>
+     
+      
+
     </div> 
     <% end %>
     <% end %>
@@ -51,5 +57,6 @@
  </div>
 </div>
 </div>
-  <%= link_to I18n.t('common.edit'), edit_gremium_path(@gremium) %> 
 
+
+</div>

From 2622ed15139a2552984fc79e009ceb1e2b66dfcc Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Mon, 27 Oct 2014 15:40:26 +0100
Subject: [PATCH 2/2] neuigkeiten max_width

---
 app/views/rubriken/index.html.erb | 2 +-
 app/views/rubriken/show.html.erb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb
index 5e86fde..33c7a68 100755
--- a/app/views/rubriken/index.html.erb
+++ b/app/views/rubriken/index.html.erb
@@ -10,7 +10,7 @@
 <% end %>
 <%= render 'tabs' %>
 <p id="notice"><%= notice %></p>
-<div class="content-wrap">
+<div class="content-wrap content-column">
 <div class="container-fluid">
   <div class="row-fluid">
     <div class="span12">
diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb
index 8a2f395..a74232b 100755
--- a/app/views/rubriken/show.html.erb
+++ b/app/views/rubriken/show.html.erb
@@ -10,7 +10,7 @@
 <% end %>
 <%= render 'tabs' %>
 <p id="notice"><%= notice %></p>
-<div class="content-wrap">
+<div class="content-wrap content-column">
 <div class="container-fluid">
 <div class="row-fluid">
 <div class="span12">