meeting style

2015-03-15 13:09:05 +01:00
parent 3cc9de7d29
commit 34c0374877
11 changed files with 55 additions and 24 deletions
--- a/app/views/calentries/_calentry.html.erb
+++ b/app/views/calentries/_calentry.html.erb
@@ -1,13 +1,6 @@
 <div class="contentbox" id="calentry_<%= calentry.id%>">
  <% image_tag("/iconnavy/time.png")  %>
-  <%= fa_icon("calendar 2x") %>
-
-  <% if (calentry.start.to_date - calentry.ende.to_date) < 1.day
-     format=:timeonly
-     else
-     format =:default
-     end %>
-  <%= calentry.text %>
+  <%= calentry.icon_text %>
 <% if !(defined? manage) || manage %>
  <%= link_to "edit", edit_calentry_path(calentry),:remote=>true if can? :edit, calentry %>
  <%= link_to 'Delete', calentry, method: :delete, data: { confirm: 'Are you sure?' } , remote: true if can? :delete, calentry %>