calender icon awesome font
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
class NeuigkeitenController < ApplicationController
|
||||
before_filter :load_toolbar_elements, :only=>[:show,:find_link]
|
||||
before_filter :load_toolbar_elements_edit, :only=>[:edit]
|
||||
|
||||
|
||||
|
||||
load_and_authorize_resource
|
||||
|
||||
def show
|
||||
@@ -57,7 +61,7 @@ class NeuigkeitenController < ApplicationController
|
||||
|
||||
def edit
|
||||
@neuigkeit = Neuigkeit.find(params[:id])
|
||||
@toolbar_elements << {:text=>I18n.t('common.show'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)} if can? :show, @neuigkeit
|
||||
|
||||
@calentries= @neuigkeit.calentries
|
||||
@calentries<< Calentry.new
|
||||
|
||||
@@ -134,7 +138,12 @@ private
|
||||
end
|
||||
|
||||
|
||||
def load_toolbar_elements_edit
|
||||
@neuigkeit = Neuigkeit.find(params[:id])
|
||||
@toolbar_elements=[]
|
||||
@toolbar_elements << {:text=>I18n.t('common.show'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)} if can? :show, @neuigkeit
|
||||
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<div class="contentbox">
|
||||
<%= image_tag("/iconnavy/time.png") %>
|
||||
<% image_tag("/iconnavy/time.png") %>
|
||||
<%= fa_icon("calendar 2x") %>
|
||||
|
||||
<% if calentry.start.to_date == calentry.ende.to_date
|
||||
format=:timeonly
|
||||
else
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<div class="row-fluid">
|
||||
<div class="span1"></div><div class="span1">
|
||||
<%= image_tag("/icon_kalender_small.png") %>
|
||||
<%= fa_icon("calendar 2x") %>
|
||||
|
||||
</div>
|
||||
<div class="span4">
|
||||
<%= f.input :start, :as => :datepicker %></div><div class="span4">
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
</div>
|
||||
<% if neuigkeit.has_calentries? %>
|
||||
<div class="pull-right" href="#">
|
||||
<%= image_tag("/iconnavy/time.png") %>
|
||||
<%= fa_icon("calendar 2x") %>
|
||||
<% unless neuigkeit.calentries.upcoming.empty? %>
|
||||
<%= neuigkeit.calentries.upcoming.first.text %>
|
||||
<% else unless neuigkeit.calentries.recent.empty? %>
|
||||
|
||||
Reference in New Issue
Block a user