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

app/controllers/neuigkeiten_controller.rb

@@ -76,7 +76,7 @@ class NeuigkeitenController < ApplicationController
     else
       page=YAML.load_file("#{::Rails.root.to_s}/config/page.yml")
      # page.feed!(:access_token=>page.access_token, :message=>@neuigkeit.text_first_words, :name=>@neuigkeit.title, :link=>rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit)+".html", :picture=>@neuigkeit.picture.url)
- page.feed!(:access_token=>page.access_token, :message=>@neuigkeit.text_first_words, :name=>@neuigkeit.title, :link=>rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit)+".html", :picture=>picture_url)
+ page.feed!(:access_token=>page.access_token, :message=>@neuigkeit.text_first_words, :name=>@neuigkeit.title, :link=>rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit)+".html")# , :picture=>picture_url)
      
       redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit auf Facebook gepostet'
     end

app/controllers/rubriken_controller.rb

@@ -10,7 +10,7 @@ class RubrikenController < ApplicationController
       @neuigkeiten = Neuigkeit.public.published.page(params[:page]).per(3)
     end   
     
-      @calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten
+    @calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten.select {|c| c.object !=nil}
     respond_to do |format|
       format.html
       format.js {render action: :show}
@@ -29,7 +29,7 @@ class RubrikenController < ApplicationController
 
     @rubrik = Rubrik.find(params[:id])
     @moderatoren=User.with_role(:newsmoderator,@rubrik)
-    @calentries= @rubrik.calendar.calentries
+    @calentries= @rubrik.calendar.calentries.select {|c| c.object !=nil}
     if can?(:showunpublished, Neuigkeit)
       @neuigkeiten = @rubrik.neuigkeiten.page(params[:page]).per(3)
     else

app/controllers/users_controller.rb

@@ -18,7 +18,8 @@ class UsersController < ApplicationController
     else
       @fbu=FbGraph::User.new(current_user.uid.to_s).fetch(:access_token=>session["fbuser_access_token"])
       File.open("config/page.yml",'w'){|f|  f.write(@fbu.accounts(:access_token=>session["fbuser_access_token"]).select { |p| p.name == params["page"] }.first.to_yaml)}
-      logger.debug @fbu.to_s
+      logger.info @fbu.to_s
+      logger.info "FbGraph Access" + session["fbuser_access_token"]
       redirect_to admin_home_index_path
     end
       

app/views/home/index.html.erb

@@ -1,3 +1,12 @@
+<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-wrap content-column" style="max-width:100em;">
  <h1><%= I18n.t('home.willkommen') %></h1>
 <%= render partial: "themen/small", object: @starttopic %>
@@ -48,6 +57,7 @@
   </p>
 
   <%= render 'beispiele' %>
+<div class="fb-like-box" data-href="https://www.facebook.com/FachschaftET" data-colorscheme="light" data-show-faces="true" data-header="true" data-stream="false" data-show-border="true"></div>
 </div>
 <div class="span7">
  <ul class="unstyled linkbox-list" style="margin:5px;">

app/views/neuigkeiten/show.html.erb

@@ -14,12 +14,22 @@ end
 :url=>neuigkeit_url(:theme=>nil)
 }
 %>
-<% set_meta_tags :og=>{:article=> {:published_time=>I18n.l(@neuigkeit.try(:datum).try(:to_date)) }} unless @neuigkeit.try(:datum).try(:to_date).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">
 <p id="notice"><%= notice %></p>
 <div class="contentbox">
@@ -52,6 +62,8 @@ 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>
+
 <% unless @neuigkeit.meeting.nil? %>
 <%= render @neuigkeit.meeting %>
 <% end%>
@@ -76,6 +88,8 @@ Nach Element suchen:
 
 <% end %>
 </div>
+
+
 <script>
 $(function(){
   dialog = $( "#findlink-body" ).dialog({

app/views/themes/blue1/home/index.html.erb

@@ -1,3 +1,12 @@
+<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-wrap content-column" style="max-width:90em;">
  <h1><%= I18n.t('home.willkommen') %></h1>
 <%= raw(@starttopic.text) %>
@@ -48,15 +57,15 @@
   </div>-->
   
   </p>
-
   <%= render 'beispiele' %>
+<div class="fb-like-box" data-href="https://www.facebook.com/FachschaftET" data-colorscheme="light" data-show-faces="true" data-header="true" data-stream="false" data-show-border="true"></div>
 </div>
 <div class="span7">
- <ul class="unstyled linklist">
+  <ul class="unstyled linklist">
 	<% @neuigkeiten.each do |n| %>
 	<li><%= render n if can?(:show, n) %> </li>
 	<% end %>
-      </ul>
+  </ul>
 </div>
 </div>
 </div>

config/sunspot.yml

@@ -1,9 +1,10 @@
 production:
   solr:
     hostname: localhost
-    port: 8983
+    port: 8080
     log_level: WARNING
-    path: /solr/production
+    path: /solr-4.10.2/default #production #ollection1 #production
+#    solr_home: solr
     # read_timeout: 2
     # open_timeout: 0.5
 
@@ -20,4 +21,4 @@ test:
     port: 8981
     log_level: WARNING
     path: /solr/test
-    
+