AutoCommit Mit Aug 19 18:03:01 CEST 2015

app/controllers/neuigkeiten_controller.rb

@@ -13,7 +13,7 @@ class NeuigkeitenController < ApplicationController
   end
   def show
     @neuigkeit = Neuigkeit.find(params[:id])
-    @rubrik=@neuigkeit.rubrik    
+    @rubrik = @neuigkeit.rubrik    
     @questions = @neuigkeit.questions.accessible_by(current_ability,:show)
     if can?(:shownonpublic, Rubrik)
       @rubriken = Rubrik.all
@@ -225,7 +225,7 @@ if  can?(:showversions, Neuigkeit)
 
     @toolbar_elements <<{:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:method=>:versions,:versions=>@versions}
 end     
-      actions << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :method=> :delete,:confirm=>'Sure?' } if can? :delete, @neuigkeit
+actions << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :method=> :delete,:confirm=>'Sure?' } if can? :delete, @neuigkeit
     @toolbar_elements << {:text => "action", :method => :dropdown, :elements=> actions} unless actions.empty?
   end
   

app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb

@@ -0,0 +1,65 @@
+<div id="neuigkeit_<%=  neuigkeit_view.id %>" class="contentbox" itemscope itemtype="http://schema.org/Article">
+  <meta itemprop="about" content="<%= neuigkeit_view.text_first_words %>"/>
+  <meta itemprop="sameAs" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/>
+  <meta itemprop="url" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/>
+
+  
+	<div >
+	<p>
+		<%= fa_icon("facebook-square") %>
+		<%= link_to fa_icon("facebook-square") +"facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit) %>
+	</p>
+	<%#= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
+	</div>  
+<div class="media">
+	  <span itemprop="articleSection">
+			<%= ff_icon(neuigkeit_view.rubrik.icon) unless neuigkeit_view.rubrik.icon.nil? or neuigkeit_view.rubrik.icon.empty? %>&nbsp;<%= neuigkeit_view.rubrik.name %>
+    </span>
+    <span class="pull-right">
+			<span itemprop="author"><%= neuigkeit_view.author.email.to_s unless neuigkeit_view.try(:author).try(:email).to_s %> 
+				<%= neuigkeit_view.author.text %></span>
+			<% unless neuigkeit_view.try(:datum).try(:to_date).nil? %>
+				<%= " "+ I18n.t("neuigkeit.am")+" " %><span itemprop="datePublished"><%= I18n.l(neuigkeit_view.try(:datum).try(:to_date))   %>
+				</span>
+			<% end %>
+  </div>
+
+  <% unless neuigkeit_view.published? %> 
+    <div class="sticker sticker-red"> Not Published <%= link_to "Publish", publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),remote:true, class: :btn if can? :publish, neuigkeit_view %></div> 
+	<% end %>
+  <% unless neuigkeit_view.origurl.nil? || neuigkeit_view.origurl.empty? %>
+		<div class="alert"><%= link_to "Zitiert von "+ neuigkeit_view.origurl, neuigkeit_view.origurl %>
+		</div>    
+  <% end %>
+  <div class="media">
+    <% unless neuigkeit_view.picture_robust.big_thumb.to_s.empty? %>
+			<div class="pull-left" href="#">
+				<p><br><%= link_to image_tag(neuigkeit_view.picture_robust.big_thumb),neuigkeit_view.picture_robust.try(:url)  %>
+				</p>
+			</div>
+    <% end %>
+    <div class="media-body">
+			<h1 itemprop="name">
+				<%= raw(neuigkeit_view.title) %>				<%= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(neuigkeit_view.rubrik, neuigkeit_view), remote: true if can? :edit, neuigkeit_view %>
+			</h1>
+			<div itemprop="articleBody">
+				<%= raw(neuigkeit_view.text) %>
+			</div>
+		</div>
+  </div>
+
+	<%= render_calentries_for(neuigkeit_view)%>
+	
+	<% unless neuigkeit_view.meeting.nil? %>
+		<%= render neuigkeit_view.meeting %>
+	<% end%>
+
+	
+
+	<%= render_attachments_for(neuigkeit_view) %>
+	</div>
+
+	<%= new_question_for(neuigkeit_view) if can? :new, Survey::Question %>
+	<% @questions.each do |q| %>
+		<%= render q if can? :show, q %>
+	<% end %>

app/views/themes/blue2/neuigkeiten/show.html.erb

@@ -0,0 +1,76 @@
+<%= content_for :header do %>
+	<title>Fetsite - <%=  @neuigkeit.title %> (<%= @neuigkeit.rubrik.name %>)</title>
+	<% set_meta_tags :author => fetprofile_path(@neuigkeit.author.fetprofile) unless @neuigkeit.author.fetprofile.nil? %>
+	<% unless @neuigkeit.picture_robust.url.nil? %>
+		<%	
+		picture_url=URI(root_url)
+		picture_url.path=@neuigkeit.picture_robust.url(:locale=>nil, :theme=>nil) 
+		%>
+	<% end %>
+	<% set_meta_tags :og => 
+	{
+	 :image => picture_url.to_s,
+	 :title => @neuigkeit.title.to_s + " (" + @neuigkeit.rubrik.name.to_s + ")",
+	 :type => "article",
+	 :description =>@neuigkeit.text_first_words,
+	 :url=>neuigkeit_url(:theme=>nil)
+	 }
+	%>
+	<%= display_meta_tags %>
+<% end %>
+
+<%= render 'rubriken/tabs' %>
+
+<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>
+
+<div class="content-column content-wrap">
+	<%= link_to "Refresh", neuigkeit_path(@neuigkeit), remote: true %>
+  <p id="notice">
+		<%= notice %>
+	</p>
+	<%= render partial: "neuigkeit_view", object: @neuigkeit %>
+
+</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>
+
+
+<%= link_to fa_icon("link") + "Neue Verknüpfung" , "#", id: "findlink-open" if can? :find_link, @neuigkeit %>
+
+<% cache(cache_array_key(@neuigkeit.nlinks, "NLinks")) do %>
+	<%= render partial: 'neuigkeiten/nlink_list_whole', :object=>@neuigkeit.nlinks %>
+<% end  %>
+
+<div id="findlink-body" class="ui-dialog" style="">
+	<% if can? :find_link, @neuigkeit %>
+		Nach Element suchen:
+		<%= semantic_form_for :find_link, :url=>find_link_rubrik_neuigkeit_path(@rubrik,@neuigkeit), :html=>{:id=>"search_form", :method=>'get'} , :remote=> true do |f| %>
+			<%= f.input :query, :input_html => { :name => 'query' },:label=>false %>
+		<% end %>
+		<%= render partial: 'nlink_list_search_whole', object: @nlink_search %>
+	<% end %>
+</div>
+
+<script>
+$(function(){
+  dialog = $( "#findlink-body" ).dialog({
+    autoOpen: false,
+    width: 350,
+    modal: true,
+    title: "Neue Verknüpfung hinzufügen",
+    buttons: {
+      "Fertig": function() {
+        dialog.dialog( "close" );
+      }
+    }
+  });
+  $("#findlink-open").on("click",function(){dialog.dialog("open")})
+});
+</script>