bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

calender icon awesome font

Browse Source
This commit is contained in:
Andreas Stephanides
2014-03-31 13:19:31 +02:00
parent b36c8ddb7c
commit 16799c57b6
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/neuigkeiten_controller.rb
View File

@@ -1,5 +1,9 @@
class NeuigkeitenController < ApplicationController class NeuigkeitenController < ApplicationController
before_filter :load_toolbar_elements, :only=>[:show,:find_link] before_filter :load_toolbar_elements, :only=>[:show,:find_link]
before_filter :load_toolbar_elements_edit, :only=>[:edit]
load_and_authorize_resource load_and_authorize_resource
def show def show
@@ -57,7 +61,7 @@ class NeuigkeitenController < ApplicationController
def edit def edit
@neuigkeit = Neuigkeit.find(params[:id]) @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= @neuigkeit.calentries
@calentries<< Calentry.new @calentries<< Calentry.new
@@ -134,7 +138,12 @@ private
end 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 end

4
app/views/calentries/_calentry.html.erb
View File

@@ -1,5 +1,7 @@
<div class="contentbox"> <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 <% if calentry.start.to_date == calentry.ende.to_date
format=:timeonly format=:timeonly
else else

3
app/views/calentries/_nested_fields.html.erb
View File

@@ -1,6 +1,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span1"></div><div class="span1"> <div class="span1"></div><div class="span1">
<%= image_tag("/icon_kalender_small.png") %> <%= fa_icon("calendar 2x") %>
</div> </div>
<div class="span4"> <div class="span4">
<%= f.input :start, :as => :datepicker %></div><div class="span4"> <%= f.input :start, :as => :datepicker %></div><div class="span4">

2
app/views/neuigkeiten/_compact.html.erb
View File

@@ -16,7 +16,7 @@
</div> </div>
<% if neuigkeit.has_calentries? %> <% if neuigkeit.has_calentries? %>
<div class="pull-right" href="#"> <div class="pull-right" href="#">
<%= image_tag("/iconnavy/time.png") %> <%= fa_icon("calendar 2x") %>
<% unless neuigkeit.calentries.upcoming.empty? %> <% unless neuigkeit.calentries.upcoming.empty? %>
<%= neuigkeit.calentries.upcoming.first.text %> <%= neuigkeit.calentries.upcoming.first.text %>
<% else unless neuigkeit.calentries.recent.empty? %> <% else unless neuigkeit.calentries.recent.empty? %>