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

Merge branch 'master' of https://github.com/fetsite/fetsite

Browse Source 
Conflicts:
	app/views/lvas/show.html.erb
This commit is contained in:
Andreas Stephanides
2015-03-20 17:29:37 +01:00
parent f1ba8f7719 044d7fc555
commit 7000870853
5 changed files with 109 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/neuigkeit.rb
View File

@@ -118,7 +118,7 @@ class Neuigkeit < ActiveRecord::Base
self.update_column(:cache_relevant_date, (c.is_past?) ? c.ende.to_date : c.start.to_date) self.update_column(:cache_relevant_date, (c.is_past?) ? c.ende.to_date : c.start.to_date)
else else
unless self.datum.nil? unless self.datum.nil?
self.update_column(:cache_order, (self.datum.to_date - Date.today).to_i.abs) self.update_column(:cache_order, (((self.datum.to_date - Date.today).to_i)/3).abs-1)
self.update_column(:cache_relevant_date, self.datum.to_date) self.update_column(:cache_relevant_date, self.datum.to_date)
else else
self.update_column(:cache_order,0) self.update_column(:cache_order,0)

6
app/views/layouts/application.html.erb
View File

@@ -4,6 +4,10 @@
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="<%= absurl("/logo2014_64.png")%>"> <link rel="shortcut icon" href="<%= absurl("/logo2014_64.png")%>">
<link rel="alternate" hreflang="de" href="<%= url_for(params.merge(:locale=>:de))%>" />
<link rel="alternate" hreflang="en" href="<%= url_for(params.merge(:locale=>:en))%>" />
<!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">--> <!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
<!----> <!---->
@@ -24,6 +28,7 @@
<div id="maincontainer" class="container-fluid"> <div id="maincontainer" class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span10 offset1 header_span"> <div class="span10 offset1 header_span">
<% cache("menu_u"+user_signed_in?.to_s+current_user.try(:id).to_s+"l"+I18n.locale.to_s+ can?(:seeintern, User).to_s+ can?(:index,Gallery).to_s, expires_in: 24.hours) do %>
<div class="header_wrap"> <div class="header_wrap">
<div class="header hidden-print"> <div class="header hidden-print">
<%= link_to home_index_path do %> <%= link_to home_index_path do %>
@@ -43,6 +48,7 @@
</div> </div>
</div> </div>
<% end %>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">

22
app/views/lvas/show.html.erb
View File

@@ -5,9 +5,7 @@
%> %>
<%= display_meta_tags %> <%= display_meta_tags %>
<% end %> <% end %>
<div itemscope itemtype="schema.org/Article" >
<div class="container-fluid"> <div class="container-fluid">
<%= render 'studien/tabs'%> <%= render 'studien/tabs'%>
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
@@ -20,13 +18,14 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span8"> <div class="span8">
<h1><%= @lva.full_name %></h1> <h1 itemprop="name"><%= @lva.full_name %></h1>
<meta itemprop="url" content="<%= lva_path(lva) %>" />
<ul class="linklist"> <ul class="linklist">
<li> <li>
<%= link_to ffi1_icon("live2")+"ET-Forum",@lva.forumlink, class: :linkbox unless @lva.forumlink.nil? or @lva.forumlink.empty?%> <%= link_to ffi1_icon("live2")+"ET-Forum", @lva.forumlink, class: :linkbox, itemprop: "discussionUrl" unless @lva.forumlink.nil? or @lva.forumlink.empty?%>
</li> </li>
</ul> </ul>
<div itemprop="articleBody">
<h2><%= I18n.t('lva.pruefungsinfo')%></h2> <h2><%= I18n.t('lva.pruefungsinfo')%></h2>
<div class=""> <div class="">
<%= @lva.pruefungsinformation.to_s.html_safe %> <%= @lva.pruefungsinformation.to_s.html_safe %>
@@ -41,7 +40,7 @@
<div class=""> <div class="">
<%= @lva.desc.to_s.html_safe %> <%= @lva.desc.to_s.html_safe %>
</div> </div>
</div>
</div> </div>
<div class="span4"> <div class="span4">
<div class="contentbox"> <div class="contentbox">
@@ -74,6 +73,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
@@ -87,6 +88,7 @@
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
@@ -100,14 +102,14 @@
</div> </div>
</div> </div>
<% cache("lva_beispiel_form_bulk_"+@lva.id.to_s+I18n.locale.to_s+@lva.updated_at.to_i.to_s) do %>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<%= render 'beispiele/form_bulk' %> <%= render 'beispiele/form_bulk' %>
</div> </div>
</div> </div>
<% end %>
</div> </div>
</div>

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

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