andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Interface fixes icons,colors

Browse Source
This commit is contained in:
Andreas Stephanides
2014-07-09 22:44:42 +05:30
parent 9bd786d053
commit 4bc7c4b001
27 changed files with 179 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
</div>
<div class="media-body">
<div>
<small><%= neuigkeit.rubrik.name %></small>
<small><%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %>&nbsp;<%= neuigkeit.rubrik.name %></small>
<small class="pull-right"> <%= I18n.t("neuigkeit.am")+" "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></small>
</div>
<h1>

5
app/views/neuigkeiten/_neuigkeit.html.erb
View File

@@ -1,4 +1,5 @@
<%= link_to [neuigkeit.rubrik,neuigkeit], {class: :linkbox} do %>
<% c =[:linkbox] %>
<% c << "color-"+neuigkeit.rubrik.color.to_s+"-dark" unless neuigkeit.rubrik.color.nil? %>
<%= link_to [neuigkeit.rubrik,neuigkeit], {class: c} do %>
<%= render :partial=>"neuigkeiten/compact",:locals=> {:neuigkeit=> neuigkeit} %>
<% end %>

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

@@ -3,7 +3,7 @@
<p id="notice"><%= notice %></p>
<div class="contentbox">
<span>
<%= @neuigkeit.rubrik.name %>
<%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %>&nbsp;<%= @neuigkeit.rubrik.name %>
</span>
<span class="pull-right">
<%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>