Merge remote-tracking branch 'origin/master' into extrafeature

app/views/beispiele/_beispiel.html.erb

@@ -1,13 +1,13 @@
-
-<div class="row-fluid contentbox">
+<div id="<%= beispiel.divid %>" class="contentbox">
+<div class="row-fluid">
   <div class="span8">
 
-<b><%=link_to ffi1_icon("note20")+" " + beispiel.name, beispiel.beispieldatei.url, title: beispiel.desc  %></b>
+    <b><%=link_to ffi1_icon("note20")+" " + beispiel.name, beispiel.beispieldatei.url, title: beispiel.desc  %></b>
 
 <%= I18n.t("file.size") + ": " + (beispiel.beispieldatei.size/1024.0).round(2).to_s  %>KiB <br>  
 <span class="linklist"><%= 
 if can?(:like, beispiel)
-link_to ffi1_icon("like3")+" like" + "("+beispiel.get_likes.size.to_s+")", like_beispiel_path(beispiel),title: "liked by " + ((current_user.liked?(beispiel)) ? ("you and " + ((beispiel.get_likes.size - 1).to_s + " others")) :  beispiel.get_likes.size.to_s)  
+link_to ffi1_icon("like3")+" like" + "("+beispiel.get_likes.size.to_s+")", like_beispiel_path(beispiel),title: "liked by " + ((current_user.liked?(beispiel)) ? ("you and " + ((beispiel.get_likes.size - 1).to_s + " others")) :  beispiel.get_likes.size.to_s), remote: true  
 else
 "liked by " + beispiel.get_likes.size.to_s
 end
@@ -15,7 +15,7 @@ end
 
 <%= 
 if can?(:dislike, beispiel)
-link_to ffi1_icon("dislike")+" dislike" + "("+beispiel.get_dislikes.size.to_s+")", dislike_beispiel_path(beispiel),title:"disliked by " + ((current_user.disliked?(beispiel)) ? ("you and " + ((beispiel.get_dislikes.size - 1).to_s + " others")) :  beispiel.get_dislikes.size.to_s) 
+link_to ffi1_icon("dislike")+" dislike" + "("+beispiel.get_dislikes.size.to_s+")", dislike_beispiel_path(beispiel),title:"disliked by " + ((current_user.disliked?(beispiel)) ? ("you and " + ((beispiel.get_dislikes.size - 1).to_s + " others")) :  beispiel.get_dislikes.size.to_s) , remote: true
 else
 "disliked by " + beispiel.get_dislikes.size.to_s
 end
@@ -23,10 +23,19 @@ end
 %>
 
 <%= link_to ff_icon("icon-pencil")+" edit", edit_beispiel_path(beispiel) if can? :edit, beispiel%>
-<%= link_to ff_icon("icon-remove")+" delete",  beispiel_path(beispiel), :method=>:delete, :data=>{:confirm=>I18n.t('beispiel.sure')} if can? :delete, beispiel %></br>
+<%= link_to ff_icon("icon-remove")+" delete",  beispiel_path(beispiel), :method=>:delete, :data=>{:confirm=>I18n.t('beispiel.sure')} if can? :delete, beispiel %>
+<%= link_to "Refresh", beispiel, remote: true %></br>
 </span>
 </div>
 <div class="span4">
 <%= beispiel.desc %>
 </div>
 </div>
+<%= link_to "comment" , new_comment_path( commentable_type: "Beispiel", commentable_id: beispiel.id), remote:true if can? :comment, beispiel %>  
+  <div id="<%= Comment.formid_for(beispiel) %>">
+  </div>
+<% unless beispiel.comments.roots.empty? %>
+<div class="row-fluid"><div class="span12"><%= render partial:"comments/comments", object: beispiel.comments.order(:created_at).roots.reverse_order %></div></div>
+<% end %>
+
+</div>

app/views/beispiele/refresh.js.erb

@@ -0,0 +1 @@
+$("#<%= @beispiel.divid %>").replaceWith("<%= escape_javascript ( render @beispiel ) %>")

app/views/beispiele/show.js.erb

@@ -0,0 +1 @@
+$("<%= '#' + @beispiel.divid %>").replaceWith("<%= escape_javascript render @beispiel %>")

app/views/comments/_comment.html.erb

@@ -0,0 +1,17 @@
+<div id="<%= comment.divid %>">
+  <a class="pull-left media-object" href="#"><%= image_tag comment.thumb_url %></a>
+  <div class="media-body"> 
+    <b><%= comment.user.try(:email) %></b> (<%= I18n.l(comment.created_at) %>): 
+<p><%= comment.text %>
+<% if can?(:comment, comment.commentable) %>
+<br><%= link_to "comment" , new_comment_path( commentable_type: "Comment", commentable_id: comment.id), remote:true  %>  
+<% end %>
+</p>
+  <%= render partial:"comments/comments", object: comment.children.order(:created_at).reverse_order  if comment.children.size >0 %>
+
+
+</div>
+  
+  <div id="<%= Comment.formid_for(comment) %>">
+  </div>
+</div>

app/views/comments/_comments.html.erb

@@ -0,0 +1,9 @@
+<% unless comments.empty? %>
+<div class="contentbox" style="border-right:none;border-bottom:none; border-top:none">
+<ul class="unstyled media-list">
+<% comments.each do |c| %>
+<li class="media"><%= render c %></li>
+<% end %>
+</ul>
+</div>
+<% end %>

app/views/comments/_form.html.erb

@@ -0,0 +1,14 @@
+<div id="<%= form.formid %>">
+  <%= semantic_form_for form , remote:true, html: {class: "form-inline"} do |f| %>
+  <%= f.inputs do %>
+ <%= f.input :commentable_id, as: :hidden %>
+ <%= f.input :commentable_type, as: :hidden %>
+ <%= f.input :text, as: :string %>
+ <%= f.input :anonym %>
+  <% end %>
+
+  <%= f.actions do %>
+    <%= f.action :submit, :as => :input %>
+  <% end %>
+<% end %>
+</div>

app/views/comments/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing comment</h1>
+
+<%= render 'form', object: @comment %>
+
+<%= link_to 'Show', @comment %> |
+<%= link_to 'Back', comments_path %>

app/views/comments/index.html.erb

@@ -0,0 +1,21 @@
+<h1>Listing comments</h1>
+
+<table>
+  <tr>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @comments.each do |comment| %>
+  <tr>
+    <td><%= link_to 'Show', comment %></td>
+    <td><%= link_to 'Edit', edit_comment_path(comment) %></td>
+    <td><%= link_to 'Destroy', comment, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Comment', new_comment_path %>

app/views/comments/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New comment</h1>
+
+<%= render partial: 'form', object: @comment %>
+
+<%= link_to 'Back', comments_path %>

app/views/comments/new.js.erb

@@ -0,0 +1 @@
+$("#<%= @comment.formid %>").replaceWith("<%= escape_javascript render partial: "form", object: @comment %>")

app/views/comments/show.html.erb

@@ -0,0 +1,6 @@
+<p id="notice"><%= notice %></p>
+
+<%= render @comment %>
+
+<%= link_to 'Edit', edit_comment_path(@comment) %> |
+<%= link_to 'Back', comments_path %>

app/views/fetprofiles/_interninfo.html.erb

@@ -1,5 +1,5 @@
 <p>
-<b>Geburtstag</b> <%= %>
+<b>Geburtstag</b> <%= I18n.l(interninfo.birthday,format: :short) %>
 </p>
 <p>
   <b>Adresse:</b>

app/views/home/admin.html.erb

@@ -9,4 +9,12 @@
 <%= semantic_form_for :set_page, url: fb_set_default_publish_page_user_path(current_user), html:{method: :get} do |f| %>
 <%= f.input :page , :input_html => { :name => 'page' }%>
 <% end %>
+
+<%= semantic_form_for :set_thema, url: choose_contact_topics_home_index_path, html:{method: :get}  do |f| %>
+<%= f.input :themen, :input_html=> {:name=>'themen'}, :as=>:select ,:multiple=>true,:collection =>Thema.all%>
+
+      <%= f.actions do %>
+      <%= f.action :submit, :as => :button, :label=> I18n.t("common.save" ) %> 
+<% end %>
+<% end %>
 </p>

app/views/home/kontakt.html.erb

@@ -1,12 +1,10 @@
 <div class="content-column content-wrap">
   <h1> <%= I18n.t "kontakt.H1" %></h1>
-  <p>
-    <%= I18n.t "kontakt.text" %>    
-  </p>
-  <h2><%= I18n.t "kontakt.service" %></h2>
-  <%= raw(I18n.t( "kontakt.service_text")) %>
-  <h2><%= I18n.t "kontakt.adresse" %></h2>
-  <p><%= raw(I18n.t("kontakt.adresse_text")) %></p>
-  <p><%= raw(I18n.t ("kontakt.telefon_text")) %></p>
+<% @themen.each do |th| %>
+<%= render partial: "themen/small", object: th %>
+<% end %>
+
+
+ 
  
 </div>

app/views/layouts/_pretty_toolbar.html.erb

@@ -6,12 +6,30 @@ Verwendung: Aufruf mit
 -->
 <% toolbar_elements = !pretty_toolbar.nil? ? pretty_toolbar : @toolbar_elements %>
 <% unless toolbar_elements.nil? || toolbar_elements.empty? %>
-<span class="label"><%= I18n.t("common.actions")%></span>
-<div class="btn-group">
+<!--<span class="label"><% I18n.t("common.actions")%></span>
+--><div class="btn-group">
   <% toolbar_elements.each do |t| %>
   <% unless t[:method]==:versions %>
-  <% text='<i class="'.html_safe+ t[:hicon].to_s.html_safe + '"></i>'.html_safe+t[:text] %>
+  <% unless t[:method]==:dropdown %>
+  
+  <% text=ff_icon(t[:hicon])+t[:text] %>
   <%= link_to text, t[:path], :method=>t[:method], :confirm=>t[:confirm].to_s, :data=>t[:data], :class=>((t[:method].to_s=='delete') ? "btn btn-danger" : "btn") ,:remote=>(t[:remote])?true : false %>
+  <% else %>
+  <div class="btn-group">
+    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+      <%= t[:text] %><span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      <% t[:elements].each do |t2| %>
+      <li>
+  <% text=ff_icon(t2[:hicon])+"&nbsp;".html_safe + t2[:text] %>
+  <%= link_to text, t2[:path], :method=>t2[:method], :confirm=>t2[:confirm].to_s, :data=>t2[:data], :class=>((t2[:method].to_s=='delete') ? "btn-danger" : "") ,:remote=>(t2[:remote])?true : false %>
+  
+      </li>
+      <% end %>
+
+    </ul>
+<% end %>
   <% else %>
   <div class="btn-group">
       <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
@@ -28,9 +46,9 @@ Verwendung: Aufruf mit
 	     q= q.merge(URI.decode_www_form(uri.query)) unless uri.query.nil?
 	    
 	     uri.query= URI.encode_www_form(q<<["version",i.to_s])
-									      %>
+	  %>
 	  <%= link_to I18n.l(v[:created_at]).to_s,uri.to_s ,:version=>v[:id] %>
-<% end %>
+	  <% end %>
 	</li>
 	<% end %>    
       </ul>

app/views/neuigkeiten/_nlink_list_search.html.erb

@@ -1,11 +1,12 @@
 
 <li>
   <%= link_to nlink_list_search.title, nlink_list_search %>
-  <%= link_to "add:"+nlink_list_search.title, create_link_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit, :link_id=>nlink_list_search.id, :link_type=>nlink_list_search.class.to_s) %>
+  <%= link_to create_link_rubrik_neuigkeit_path(@neuigkeit.rubrik, @neuigkeit, :link_id=>nlink_list_search.id, :link_type=>nlink_list_search.class.to_s), remote: true do %>
   <div class="contentbox" >
     <% p = nlink_list_search.class.to_s.downcase.pluralize+"/nlink" %>
     <%= render :partial=>p, :object=>nlink_list_search %>
   </div>  
+<% end %>
 </li>
 
 

app/views/neuigkeiten/create_link.js.erb

@@ -0,0 +1,2 @@
+$('#nlink_list_search').html("");
+$('#nlink_list').html("<%= escape_javascript( render partial:"nlink_list", collection: @nlinks )%>"); 

app/views/themen/_attachment_list.html.erb

@@ -8,9 +8,15 @@
 </td>
 <% if editor %>
 <td>
-<%= link_to "Edit", edit_thema_attachment_path(a.thema,a) %>
-<%= link_to "Delete", thema_attachment_path(a.thema,a), method: "DELETE", confirm: "Sure?" %>
-
+<div class="dropdown">
+<a class="dropdown-toggle" data-toggle="dropdown" href="#">Actions</a>
+<ul class="dropdown-menu">
+<li>
+<%= link_to ff_icon("icon-pencil")+"Edit", edit_thema_attachment_path(a.thema,a) %>
+</li><li>
+<%= link_to "Delete Attachment", thema_attachment_path(a.thema,a), method: "DELETE", confirm: "Sure?" , class: "btn-danger " %>
+</li></ul>
+</div>
 </td>
 <% end %>
 </tr>

app/views/themen/_select.html.erb

@@ -2,19 +2,33 @@
   <% select.attachments.each_slice(6) do |row| %>
   <div class="row-fluid">
     <% row.each do |attachment|
-       data_ext = attachment.datei.file.extension.downcase %>
+%>
     <div class="span2" align="center">
-      <%= link_to attachment.name, edit_thema_attachment_path(@thema,attachment) %></br>
-      <% if (!["jpg","png","jpeg"].find_index(data_ext).nil?) %>
+<div class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+      <% if attachment.image? %>
       <%= image_tag attachment.datei.thumb.url %>
       <% else %>
       <%= image_tag "pdf-logo.jpg" %>
       <% end %>
+      </a>
       <% if(editor) %>
-      </br><button type="button" onclick="insertAttachment(<%="\"" + attachment.datei.url + "\""%>,<%="\""+attachment.name+"\""%>)">Insert Me!</button>
-      <% else %>
-      </br><%= link_to 'Destroy',[@thema,attachment], method: :delete, data: { confirm: 'Are you sure?' } %>
+      </br>
+<ul class="dropdown-menu">
+  <li>
+ <a href="#" onclick="insertAttachment(<%="\"" + attachment.datei.url + "\""%>,<%="\""+attachment.name+"\""%>)"> Datei einfügen</a></li>
+      <% if attachment.image? %>
+      <li><a type="button" onclick="insertAttachment(<%="\"" + attachment.datei.thumb_big.url + "\""%>,<%="\""+attachment.name+"\""%>)">Thumb einfügen</a></li>
       <% end %>
+</ul>
+
+      <% else %>
+<ul class="dropdown-menu">
+<li>
+     <%= link_to 'Destroy',[@thema,attachment], method: :delete, data: { confirm: 'Are you sure?' } %>
+</li>
+</ul>      <% end %>
+</div>
     </div>
     <% end %>
   </div>

app/views/themen/_small.html.erb

@@ -1,3 +1,4 @@
+<% if can? :show, small %>
 <a name="thema_<%=small.id%>" href="#<%=small.id%>">
   <h2><%= small.title %> <%= link_to fa_icon("pencil"), verwalten_thema_path(small) if can? :edit, small  %></h2>
 </a>
@@ -30,3 +31,6 @@
 @small_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('thema.edit'), :path=>small} if can? :edit, small 
 @small_elements << {:hicon=>'icon-remove-circle',:text=>I18n.t('thema.remove'), :path=>small, :method=>:delete,:confirm=>I18n.t('thema.sure')} if can? :delete, small %>
 <% render :partial=>'layouts/pretty_toolbar', :object=>@small_elements unless @small_elements.empty? %>
+<% else %>
+Error
+<% end %>

app/views/themen/_thema.html.erb

@@ -1,2 +1,2 @@
-  <%= thema.title%>
+  <%= thema.title if can? :show , thema %>
 

app/views/themen/_verw_liste.html.erb

@@ -1,8 +1,13 @@
 <% verw_liste.each do |thema| %>
-<li id="themen_<%= thema.id %>" class="sort"  ><div class="contentbox handle" ><b><%= thema.title %></b> </div>
- 
-<%= link_to thema_path(thema),:remote=>true do %> Show <% end %> 
-<%= link_to edit_thema_path(thema),:remote=>true do %> Edit <% end %>  
-<%= link_to fragen_thema_path(thema),:remote=>true do %> Fragen <% end %>
-<%= link_to attachments_thema_path(thema),:remote=>true do %> Attachments <% end %></li>
+<li id="themen_<%= thema.id %>" class="sort"  >
+<div class="dropdown contentbox handle">
+<a href="#" data-toggle="dropdown" class="dropdown-toggle"><b><%= thema.title %></b></a> <%= link_to thema_path(thema),:remote=>true do %> <%= fa_icon('eye') %>   <% end %><%= link_to edit_thema_path(thema),:remote=>true do %> <%= ff_icon('icon-pencil') %> <% end %>
+
+ <ul class="dropdown-menu">
+<li><%= link_to thema_path(thema),:remote=>true do %> <%= fa_icon('eye') %> Show <% end %></li> 
+<li><%= link_to edit_thema_path(thema),:remote=>true do %> <%= ff_icon('icon-pencil') %> Edit <% end %>  </li>
+<li><%= link_to fragen_thema_path(thema),:remote=>true do %> Fragen <% end %></li>
+<li><%= link_to attachments_thema_path(thema),:remote=>true do %> Attachments <% end %></li>
+</ul>
+</li>
 <% end %>

app/views/themengruppen/_themengruppe.html.erb

@@ -1,4 +1,5 @@
 <%= link_to themengruppe,{:class=>'linkbox color-1-dark'} do %>
+      <div class="container-fluid">
 <div class="row-fluid">
   <div class="span12">
     <div class="media">
@@ -45,5 +46,5 @@
 
 
 </div>
-
+      </div>
 <% end %>

app/views/themengruppen/index.html.erb

@@ -2,21 +2,21 @@
   <%= render :partial=>'layouts/pretty_toolbar' %>
   <ul class="linklist">
     <li>
-    <%= link_to fa_icon("question")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
-</li>
-</ul>
-  </p>
-  <ul class="unstyled linkbox-list">
-    <li>  
-      <% @themengruppen.each do |themengruppe| %>
-      <div class="container-fluid">
-	<%= render themengruppe if can?(:show,themengruppe)%>
-      </div>
-      <% end %>
+      <%= link_to fa_icon("question")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
     </li>
   </ul>
+</p>
+<ul class="unstyled linkbox-list">
+    <% @themengruppen.each do |themengruppe| %>
+  <li>  
 
-  <br/>
+    <%= render themengruppe if can?(:show,themengruppe)%>
+
+  </li>
+    <% end %>
+</ul>
+
+<br/>
 </div>
 
 <script class="hidden-phone">

app/views/themengruppen/show.html.erb

@@ -1,13 +1,13 @@
 <div class="content-wrap content-column" >
   <ul class="linklist">
-<% if @themengruppe.public %>
-<li>  <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("themengruppe.showall"), themengruppen_path, :class=>"linkbox" %></li>
-<% else %>
-<li>  <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("common.intern"), intern_home_index_path, :class=>"linkbox" %></li>
-<% end %>
-  <li><%= link_to fa_icon("question 2x")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
-</li>
-</ul>
+    <% if @themengruppe.public %>
+    <li><%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("themengruppe.showall"), themengruppen_path, :class=>"linkbox" %></li>
+    <% else %>
+    <li>  <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("common.intern"), intern_home_index_path, :class=>"linkbox" %></li>
+    <% end %>
+    <li><%= link_to fa_icon("question 2x")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
+    </li>
+  </ul>
   <%= render :partial=>'layouts/pretty_toolbar' %>
 
   <h1>	<% unless @themengruppe.icon.nil? or @themengruppe.icon.empty? %>      <i class="<%= @themengruppe.icon %>" style="font-size:1.5em;margin:0"></i>

app/views/themes/blue1/home/index.html.erb

@@ -3,11 +3,18 @@
 <div class="container-fluid">
 <div class="row-fluid">
 <div class="span6">
- 
-     
-<p>
-<%= ffi1_icon "academic" %><%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
-</p>
+  
+  <ul class="linklist">
+    <li>
+      <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
+    </li>
+    <li>
+      <%= link_to "Entwicklungsstatus" , dev_home_index_path ,class: :linkbox %>
+    </li>
+    <li>  
+      <%= link_to "FAQS", faqs_themengruppen_path,class: :btn ,class: :linkbox %>
+    </li>
+  </ul>
   <div class="alert">
     <h2>Beta Test</h2>
     <p>Die Webseite befindet sich derzeit in einem Entwicklungsstadium,
@@ -28,9 +35,7 @@
     </p>
 
   </div>
-  <%= link_to "Entwicklungsstatus" , dev_home_index_path %>
-  <p>  
-    <%= link_to "FAQS", faqs_themengruppen_path,class: :btn %>
+  
   </p>
 
   <%= render 'beispiele' %>

app/views/themes/white_1/themengruppen/show.html.erb

@@ -1,29 +1,38 @@
-<h1><%= @themengruppe.title %></h1>
-
+<h1><% unless @themengruppe.icon.nil? or @themengruppe.icon.empty? %>      <i class="<%= @themengruppe.icon %>" style="font-size:1.5em;margin:0"></i>
+      <% end %><%= @themengruppe.title %></h1>
 <p>
   <%= @themengruppe.text %>
 </p>
 
 <div class="accordion" id="accordion1">
   <% @themen.each do |thema| %>
-	  <div class="accordion-group">
-		<div class="accordion-heading">
-		  <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapse<%=thema.id%>">
-			<%= thema.title %>
-		  </a>
-		</div>
-		<div id="collapse<%=thema.id%>" class="accordion-body<%= ' collapse' unless params['thema'].to_i==thema.id %>">
-		  <div class="accordion-inner">
-	<% unless thema.gremium.nil? %>
-			<p><%= link_to "Zu dem Gremium ..." , thema.gremium %>
-			</p>
-<% end %>		
-	<%= render :partial => 'themen/small', :object => thema %>
-		
+  <div class="accordion-group">
+    <div class="accordion-heading">
+      <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapse<%=thema.id%>">
+	<%= thema.title %>
+      </a>
+    </div>
+    <div id="collapse<%=thema.id%>" class="accordion-body<%= ' collapse' unless params['thema'].to_i==thema.id %>">
+      <div class="accordion-inner">
 
-		  </div>
-		</div>
-	  </div>
+	<%= render :partial => 'themen/small', :object => thema %>
+	<ul class="unstyled">
+	  <% unless thema.gremium.nil? %>
+	  <li>
+	    <%= link_to fa_icon("users 2x")+thema.gremium.name , thema.gremium,:class=>"linkbox" %>
+	  </li>
+	  <% end %>		
+	  
+	  <% thema.nlinks.each do |l| %> 
+	  <li>
+	    <%= render l.neuigkeit if can? :show, l.neuigkeit%>
+	  </li>
+	  <% end %>
+
+	</ul>
+      </div>
+    </div>
+  </div>
   <% end %>
 </div>