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

neuigkeiten Themen view fix

Browse Source
This commit is contained in:
Andreas Stephanides
2015-02-25 11:42:12 +01:00
parent 564c355d2d
commit ad375d6c10
4 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,27 +1,32 @@
<div class="media">
<div class="media" itemscope itemtype="http://schema.org/Article">
<meta itemprop="sameAs" content="<%= rubrik_neuigkeit_path(neuigkeit.rubrik,neuigkeit, {theme: nil,locale: nil})%>"/>
<div class="pull-left" href="#">
<p><br><%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %>
</p>
<p><br>
<% unless neuigkeit.picture.url.nil? %><%= image_tag neuigkeit.picture.thumb.url %> <meta imageprop="thumbnailUrl" content="<%= neuigkeit.picture.thumb.url%>"/>
<% end %> </p>
</div>
<div class="media-body">
<div>
<small><%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %>&nbsp;<%= neuigkeit.rubrik.name %></small>
<% unless neuigkeit.has_calentries? %> <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> <% end %>
<small><%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %>&nbsp;<span itemprop="articleSection"><%= neuigkeit.rubrik.name %></span></small>
<% unless neuigkeit.has_calentries? %> <small class="pull-right"><% unless neuigkeit.try(:datum).try(:to_date).nil? %>
<%= I18n.t("neuigkeit.am") %>
<span itemprop="datePublished" datetime="<%= neuigkeit.try(:datum).to_formatted_s(:iso8601)%>"> <%= I18n.l(neuigkeit.try(:datum).try(:to_date))%> </span>
<% end %> </small> <% else %> <meta itemprop="datePublished" content="<%= neuigkeit.try(:datum).to_formatted_s(:iso8601) %>"/> <% end %>
</div>
<h1>
<h1 itemprop="name">
<%= neuigkeit.title%>
</h1>
<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
</h1><div itemprop="description">
<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%></div>
</div>
<% if neuigkeit.has_calentries? %>
<div class="pull-right" href="#">
<%= fa_icon("calendar 2x") %>
<% unless neuigkeit.calentries.upcoming.empty? %>
<%= neuigkeit.calentries.upcoming.first.text %>
<% else unless neuigkeit.calentries.recent.empty? %>
<%= neuigkeit.calentries.recent.first.text %>
<% end %><% end %>
</div>
<% end %>
<div class="pull-right" href="#">
<%= fa_icon("calendar 2x") %>
<% unless neuigkeit.calentries.upcoming.empty? %>
<%= neuigkeit.calentries.upcoming.first.text %>
<% else unless neuigkeit.calentries.recent.empty? %>
<%= neuigkeit.calentries.recent.first.text %>
<% end %><% end %>
</div>
<% end %>
</div>

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

@@ -70,7 +70,7 @@ end
<%= render ce unless ce.nil? %>
<% end %>
</div>
<div class="fb-like" data-href"<%= rubrik_neuigkeit_url(@rubrik,@neuigkeit)%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
<div class="fb-like" data-href"<%= rubrik_neuigkeit_url(@rubrik,@neuigkeit,{themes: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
<% unless @neuigkeit.meeting.nil? %>
<%= render @neuigkeit.meeting %>

5
app/views/themen/_small.html.erb
View File

@@ -1,6 +1,8 @@
<% if can? :show, small %>
<a name="thema_<%=small.id%>" href="#<%=small.id%>">
<h2><%= link_to small.title,small %> <%= link_to fa_icon("pencil"), verwalten_thema_path(small) if can? :edit, small %> </h2>
<div itemscope itemtype="http://schema.org/Article">
<meta itemprop="sameAs" content="<%= thema_url(thema, {theme:nil, locale:nil})%>"/>
<h2><span itemprop="name"><%= link_to small.title,small %></span> <%= link_to fa_icon("pencil"), verwalten_thema_path(small) if can? :edit, small %> </h2>
</a>
<%= image_tag small.titlepics.first.datei.url unless small.titlepics.first.nil? %>
<% if small.is_outdated? %>
@@ -68,3 +70,4 @@
<% else %>
Error
<% end %>
</div>

10
app/views/themen/show.html.erb
View File

@@ -23,6 +23,14 @@
<p id="notice"><%= notice %></p>
<% link_to "Zurück", @thema.themengruppe %>
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/de_DE/sdk.js#xfbml=1&appId=120379864660921&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<% thema=@thema %><div class="content-wrap content-column" >
@@ -44,6 +52,8 @@
</ul>
</div>
<div class="fb-like" data-href"<%= thema_url(@thema,{theme: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
<br>
<div class="">