Merge branch 'opengraph'

2015-02-17 19:00:37 +01:00
parent 5c8b8dcfe6 aa6d291495
commit 1cb6cecf81
8 changed files with 36 additions and 4 deletions
--- a/2
+++ b/2
@@ -117,6 +117,8 @@ gem 'whenever'
 gem 'yaml_db'
 gem 'etherpad-lite'

+gem 'opengraph_parser'
+
 # Image gallery
 gem 'blueimp-gallery'
 gem 'blueimp-gallery-rails'
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -26,7 +26,16 @@ class HomeController < ApplicationController
    

  end
-
+  def log
+    authorize! :doadmin, User
+    lines = params[:lines]
+    if Rails.env == "production"
+      @logs = `tail -n #{lines} log/production.log | grep Error`
+    else
+      @logs = `tail -n #{lines} log/development.log | grep -v 'actionpack\\|railties\\|activesupport\\|::Translation'`
+    end
+    
+  end
  def startdev
  render 'setup_fetsite_dev'
  end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -94,4 +94,12 @@ end
 	end
    raw(html)
 end
+  def absurl(path)
+     if path.nil?
+       return nil
+     end
+    url=URI(root_url)
+    url.path=path
+    return url
+  end
 end
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -64,6 +64,18 @@ class Neuigkeit < ActiveRecord::Base
  def name
    self.title
  end
+  def load_from_facebook(link)
+    event=FbGraph::Event.new(link).fetch(:access_token=>"CAABtfB8SO7kBADyHVHnWHqsxsU1bqqmeDdZCp7V1KF9G4o3oFHcZBq0IB8X3ird4muVIPuWKZB8jL1o9JCON60Lmnvk8rkZA2dyZAuU95dC0SWzOEnhtAEkyzZCN6hkKXdl87o38OloLBivc2kjJYmpUVKzdZAD5ywxKG7Hv5FWxXf6amWA782JSmcxgWsRDH4ZAZBXsUrhpnILNOVoKSBf1mGyfrFiPvA3QZD")
+    self.title=event.name
+    self.text=event.description
+    unless event.start_time.nil?
+      ce=Calentry.new(:start=>event.start_time, :ende=>event.end_time , :typ=>1)
+      ce.ende=ce.start if ce.ende.nil?
+      self.calentries<< ce
+      ce.save
+
+    end
+  end
  def text_first_words
    md = /<p>(?<text>[^\<\>]*)/.match Sanitize.clean(self.text,:elements=>['p'])
    words=md[:text].split(" ") unless md.nil?
--- a/app/views/home/log.html.erb
+++ b/app/views/home/log.html.erb
@@ -0,0 +1 @@
+<pre><%= @logs %></pre>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,7 +3,7 @@

  <head>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" href="logo2014_64.png"> 
+    <link rel="shortcut icon" href="<%= absurl("/logo2014_64.png")%>"> 
    <!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
    <!---->
    
--- a/app/views/rubriken/_admin_liste.html.erb
+++ b/app/views/rubriken/_admin_liste.html.erb
@@ -5,8 +5,7 @@
    <td><%= fa_icon "globe" if r.public%></td>
    <td><%= r.name %></td>
    <td>
-      <%= n.title %> 
-     
+      <%= link_to n.title, n %>     
    </td> 
    <td>
      <%= unless n.datum.nil? 
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -135,6 +135,7 @@
          get 'linksnotimplemented'
          get 'kontakt'
          get 'choose_contact_topics'
+          get 'log'
        end
      end