fixed to string conversion in missing galleries and photos

app/controllers/home_controller.rb

@@ -21,10 +21,15 @@ class HomeController < ApplicationController
 
   end
   def infoscreen
-    authorize! :infoscreen, User 
+    authorize! :infoscreen, User
     @neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).where(flag_infoscreen: true)
     render layout: false
   end
+  def verleihkalender
+    authorize! :verleihkalender, User
+    #@neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).where(flag_infoscreen: true)
+    render layout: false
+  end
   def kontakt
     t=YAML.load_file("#{::Rails.root.to_s}/config/contact_topic.yml")
     @themen = Thema.where(:id=>t)
@@ -116,5 +121,4 @@ class HomeController < ApplicationController
     File.open("config/contact_topic.yml",'w'){|f|  f.write(t.to_yaml)}
     redirect_to admin_home_index_path
   end
-
 end

app/models/ability.rb

@@ -4,7 +4,7 @@ class Ability
   include CanCan::Ability
   def initialize(user,request=nil,key=nil)
     tunet=IPAddr.new("128.131.95.0/24")
-local=IPAddr.new("127.0.0.1")
+    local=IPAddr.new("127.0.0.1")
     loggedin=!(user.nil?)
     unless key.nil?
       k=Key.find_by_uuid(key)
@@ -16,6 +16,9 @@ local=IPAddr.new("127.0.0.1")
     if  (user.has_role?("fetuser") || user.has_role?("fetadmin") || tunet.include?(IPAddr.new(request.remote_ip)) || local.include?(IPAddr.new(request.remote_ip)))
     can :infoscreen, User
     end
+    if  (user.has_role?("fetuser") || user.has_role?("fetadmin") || tunet.include?(IPAddr.new(request.remote_ip)) || local.include?(IPAddr.new(request.remote_ip)))
+    can :verleihkalender, User
+    end
 
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
       can [:show,:answer, :create,:new, :create_from_template, :flag], Survey::Question
@@ -29,10 +32,10 @@ local=IPAddr.new("127.0.0.1")
       can [:delete,:flag_template], Survey::Question
     end
     #---------------------------------------------------
-    
+
     can [:index,:hide], Comment
     can :show, Comment
-    
+
     if loggedin
       can [:create,:new], Comment
       can [:comment], Comment
@@ -52,7 +55,7 @@ cannot :destroy, Comment
     can [:create, :show], Beispiel, flag_delete: false
     if loggedin
       can :like, Beispiel
-      can :dislike, Beispiel    
+      can :dislike, Beispiel
     end
     if ((user.has_role?("moderator",Beispiel)) || user.has_role?("fetuser") || user.has_role?("fetadmin"))
       can :flag, Beispiel
@@ -76,22 +79,22 @@ cannot :destroy, Comment
       can :manage, Studium
       #can :manage, Beispiel
       can :comment, Beispiel
-      
+
       can :manage, Lecturer
-      
+
     end
     unless user.has_role?("fetadmin")
-      cannot :delete, Studium    
+      cannot :delete, Studium
       cannot :delete, Modulgruppe
       cannot :delete, Modul
-  
+
     end
     if user.has_role?("fetadmin")
     can [:index, :parse, :show], Crawlobject
 end
     #-----------------------------------------------------
     # Rechteverwaltung fuer Informationen
-    can [:show, :index,:faqs], Themengruppe, :public=>true  
+    can [:show, :index,:faqs], Themengruppe, :public=>true
     can [:show], Thema, :isdraft=>false,  :themengruppe=>{:public=>true}
     can :show, Frage
     if loggedin
@@ -133,7 +136,7 @@ end
     unless user.has_role?("fetadmin")
       cannot :delete, Gallery
     end
-    
+
     #-----------------------------------------------------
     # Rechteverwaltung fuer Mitarbeiter
     can [:show, :index], Fetprofile
@@ -149,7 +152,7 @@ end
       cannot :delete, Fetprofile
       cannot :delete ,Gremium
     end
-    
+
     #-----------------------------------------------------
     # Rechteverwaltung fuer Neuigkeiten
     can :index, Rubrik
@@ -171,9 +174,9 @@ end
       can :shownonpublic, Rubrik
       can :manage, Nlink
     end
-    if user.has_role?("newsadmin") || user.has_role?("fetadmin") 
+    if user.has_role?("newsadmin") || user.has_role?("fetadmin")
       can :addmoderator, Rubrik
-    end    
+    end
     if user.has_role?("fetadmin")
       can :addfetuser, User
       can :addfetadmin, User
@@ -184,8 +187,8 @@ end
       can :manage, User
       can :set_preferred_theme, User
     end
-    
-    if user.has_role?("newsadmin") || user.has_role?( "fetadmin") || user.has_role?( "fetuser") 
+
+    if user.has_role?("newsadmin") || user.has_role?( "fetadmin") || user.has_role?( "fetuser")
       can :manage, Rubrik
       can :manage, Neuigkeit
       can :showunpublished, Neuigkeit
@@ -200,7 +203,7 @@ end
       can [:show, :edit, :update,:new,:create,:write, :write_etherpad, :read_from_etherpad, :dump_to_etherpad, :search], Document
       can :manage, Meeting
       can :manage, Meetingtyp
-    end    
+    end
     if user.has_role?("fetadmin")
       can :manage, Document
     end
@@ -213,19 +216,19 @@ end
     end
     if user.has_role?( "fetadmin")
       can :manage, Meetingtyp
-      
+
     end
-    
-    # Rechteverwaltung Kalender 
-    can [:show, :index], Calendar, :public => true 
+
+    # Rechteverwaltung Kalender
+    can [:show, :index], Calendar, :public => true
     can [:showics], Calendar
     # can [:show], Calentry
-    if  (!k.nil? && k.typ==1 && (k.user.has_role?("fetuser")||k.user.has_role?("fetadmin")))  
+    if  (!k.nil? && k.typ==1 && (k.user.has_role?("fetuser")||k.user.has_role?("fetadmin")))
       if k.parent.nil?
         can [:show,:index], Calendar
       else
         can [:show], Calendar, id: k.parent_id
-      end 
+      end
     end
 
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
@@ -242,6 +245,6 @@ end
     if user.has_role?("fetadmin")
       can :emails,User
     end
-    
+
   end
 end

app/models/document.rb

@@ -72,16 +72,16 @@ class Document < ActiveRecord::Base
     unless self.is_etherpad?  || self.id.nil?
       self.etherpadkey="document_"+ self.id.to_s
 
-      if self.text.nill?
+      if self.text.nil?
         self.ep_pad.html = '<div>'+"text"+'</div>'
       else
         self.ep_pad.html = '<div>'+self.text+'</div>'
       end
-    end      
+    end
   end
   def dump_to_etherpad
     if self.is_etherpad?
-      if self.text.nill?
+      if self.text.nil?
         self.ep_pad.html = '<div>'+"text"+'</div>'
       else
         self.ep_pad.html = '<div>'+self.text+'</div>'

app/views/fotos/show.html.erb

@@ -8,10 +8,9 @@ top: 0" %>
 <% #,  gallery_foto_path(@foto.gallery,  ((@foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].nil?) ? (@foto.gallery.fotos[0].try(:id).to_i) : @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].try(:id).to_i) ) %>
 <div style="position:absolute; bottom:0; ">
   <%= link_to ff_icon('icon-circle-arrow-down').html_safe, @foto.datei.url,
-      :class=>"btn",title: I18n.t('fotos.download')+': '+@foto.title,:target=>:blank, :style=>"" %>
+      :class=>"btn",title: I18n.t('fotos.download')+': '+@foto.title.to_s,:target=>:blank, :style=>"" %>
   <!-- <div class="fb-like" data-href"<%=  gallery_foto_path(@foto.gallery,@foto, {fotoid:@foto.id,theme: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>-->
   <%= render_shareable  :url=>gallery_foto_url(@foto.gallery,@foto, {theme: nil, locale: nil}),:static_link=>true, :buttons=>[:facebook, :twitter, :google_plus] %>
   <p id="notice"><%= notice %></p>
 
 </div>
-

app/views/galleries/show.html.erb

@@ -1,7 +1,7 @@
 <%= content_for :header do %>
 <title>Fet - Fotos: <%=  @gallery.name %></title>
 
-<% 
+<%
    if @openfotoid.nil? || @openfotoid==0
    @firstfoto= @fotos_p.first
    unless @firstfoto.nil?
@@ -70,7 +70,7 @@ end
       <!--    <div class="pagination pull_left" style="margin:0px 0px 0px 0px">
 	      <ul>
 		<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => (@page==1 ? @page : @page-1)} %>"><%=I18n.t('fotos.prev')%></a></li>
-		<% # for i in 1..@pages do 
+		<% # for i in 1..@pages do
 		   i=1 %>
 		<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => i} %>"><%=i%></a></li>
 		<% # end %>
@@ -131,7 +131,7 @@ end
       <% @fotos_p.each do |f| %>
       <div class="left">
 	<div id="links">
-	  <% if (@openfotoid.to_i==f.id) %> 
+	  <% if (@openfotoid.to_i==f.id) %>
 	  <meta  itemprop="image" content="<%= f.datei.resized.url %>"/>
 	  <% end %>
 	  <div  <% if (@openfotoid.to_i==f.id) %> itemprop="primaryImageOfPage"<% else %> itemprop="hasPart" <% end %> itemscope itemtype="http://schema.org/ImageObject">
@@ -145,9 +145,12 @@ end
 	  </div>
 	</div>
 	<%= link_to ff_icon('icon-circle-arrow-down').html_safe, f.datei.url,
-	    :class=>"btn-small",title: I18n.t('fotos.download')+': '+f.title.to_s, rel: 'tooltip' %>
+	    :class=>"btn-small",title: I18n.t('fotos.download').to_s+': '+f.title.to_s, rel: 'tooltip' %>
 	<%= link_to ff_icon('icon-remove-circle').html_safe, gallery_foto_path(@gallery, f),
-            :method => :delete, :class=>"btn-small btn-danger",title: I18n.t('fotos.delete')+': '+f.title, rel: 'tooltip', confirm:  I18n.t('fotos.delete')+': '+f.title+', Sicher?' if can?(:delete,f) %>
+            :method => :delete, :class=>"btn-small btn-danger",
+            title: I18n.t('fotos.delete').to_s+': '+f.title.to_s, rel: 'tooltip',
+            confirm:  I18n.t('fotos.delete').to_s+': '+f.title.to_s+',
+             Sicher?' if can?(:delete,f) %>
 	<p></p>
       </div>
       <% end %>
@@ -169,21 +172,21 @@ end
       <%= link_to ff_icon('icon-remove-circle').html_safe, '',
 	  :class=>"btn-small btn-danger"%>: <%= I18n.t('fotos.delete')%>
       <p></p>
-      
+
     </div>
     <% end %>
     <%= render 'layouts/pretty_toolbar' %>
   </div>
 </div>
 <%= javascript_include_tag "blueimp-gallery-all" %>
-  
+
 <script>
   blueimp.Gallery.prototype.textFactory = function (obj, callback) {
   var $element = $('<div>')
     .addClass('slide-content')
     .attr('title', obj.title)
     .attr('histItem',obj.getAttribute('histitem'));
-    
+
     $.get(obj.href)
     .done(function (result) {
     $element.html(result);
@@ -201,13 +204,13 @@ end
     return $element[0];
     };
     $('#openpic').click()
-    
-    
+
+
     blueimp.Gallery.prototype.onslide = (function(_super) {
     return function(index) {
     history.pushState({},"Foto",String(this.list[index].getAttribute('histitem')));
     return _super.apply(this, arguments);
-    }; 
+    };
     })(blueimp.Gallery.prototype.onslide);
 </script>
 <style>
@@ -221,5 +224,3 @@ end
   * html .fb-like{display:inline}/* ie6 inline block fix*/
   *+html .fb-like{display:inline}/* ie7 inline block fix*/
 </style>
-
-  

app/views/home/index.html.erb

@@ -13,16 +13,13 @@
 <div class="container-fluid">
 <div class="row-fluid">
 <div class="span5">
-  
+
   <ul class="linklist">
-    <li>
-      <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
-    </li>
     <li>
       <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
     </li>
-   
-    <li>  
+
+    <li>
       <%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
     </li>
     <li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox unless Studium.first.nil? %></li>
@@ -33,7 +30,7 @@
     <li>
       <%= link_to t1 do %>
       <%= render partial: "themen/nlink", object: t %>
-      <%= end %> 
+      <%= end %>
     </li>
     <% end %>
   </ul>
@@ -60,4 +57,3 @@ Verschiedene Styles
 </div>
 </div>
 </div>
-

app/views/home/infoscreen.html.erb

@@ -3,7 +3,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty?  %>
     <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
-    <%= stylesheet_link_tag "infoscreenframe.css" %>
+    <%= stylesheet_link_tag "/iframe/infoscreenframe.css" %>
 
    <%= javascript_include_tag "application" %>
     <%= javascript_include_tag "jmpress" %>

app/views/home/verleihkalender.html.erb

@@ -0,0 +1,18 @@
+
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty?  %>
+    <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
+    <%= stylesheet_link_tag "infoscreenframe.css" %>
+
+   <%= javascript_include_tag "application" %>
+    <%= javascript_include_tag "jmpress" %>
+
+	</head>
+	<body>
+    <iframe style="border-width: 0;"
+      src="https://calendar.google.com/calendar/embed?src=f7i0qj89nelp59lq8panbqr2ek%40group.calendar.google.com&src=8gec92r2kpn59jqm4gclg06nrg%40group.calendar.google.com&color=%23853104" width="100%" height="100%" frameborder="0" scrolling="no">
+    </iframe>
+    <script language="javascript" type="text/javascript">setTimeout("location.reload();",60000);</script>
+    <!-- reloads automatically once every 60sec = 1min -->
+	</body>

config/routes.rb

@@ -15,8 +15,8 @@
           get 'internlist'
         end
       end
-     resources :gremien do 
-        collection do 
+     resources :gremien do
+        collection do
           get 'verwalten'
         end
       end
@@ -35,7 +35,7 @@
      resources :choices
 
    end
-   
+
   themes_for_rails
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
   resources :home, :only=>[:index] do
@@ -47,7 +47,7 @@ resources :emails, :only=>[:index] do
 end
   get ':locale', constraints: {locale: /en|de/}, action: :language,controller: :home, as: "language"
   scope '(:locale)/admin' do
-    resources :users, :only=>[]  do 
+    resources :users, :only=>[]  do
       collection do
         get :index
         post :all_update
@@ -73,13 +73,14 @@ end
   end
   devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"}
 
- 
+
   scope '(:locale)', constraints: {:locale=>/en|de/i} do
-    get 't/:theme/:url', to: redirect('/%{url}') 
+    get 't/:theme/:url', to: redirect('/%{url}')
     scope '(t/:theme)' do
       get "" , controller: :home, action: :index
       get "intern" , controller: :home, action: :intern
       get "infoscreen" , controller: :home, action: :infoscreen
+      get "verleihkalender" , controller: :home, action: :verleihkalender
       get "beispielsammlung", to: redirect('/studien')
       scope '(:ansicht)' do
         resources :studien, :only=>[:new,:edit,:update,:destroy,:show] do
@@ -88,11 +89,11 @@ end
           end
         end
       end
-      
+
       resources :modulgruppen,:only =>[:create,:index] do
       end
-      
-      resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do 
+
+      resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do
         resources :modulgruppen, :path => "(:locale)/modulgruppen"
       end
       get 'verwalten/studien', :controller=>:studien, :action=>:verwalten, :as=>'studien_verwalten'
@@ -102,7 +103,7 @@ end
       resources :moduls do
         member do
           get 'edit_lvas'
-          post 'update_lvas'       
+          post 'update_lvas'
           get 'load_tiss'
           post 'show_tiss'
         end
@@ -111,7 +112,7 @@ end
           get 'new_bulk'
           post 'update_bulk'
         end
-        
+
       end
       resources :beispiele do #, :only=>[:show,:index,:create]
         member do
@@ -121,7 +122,7 @@ end
           get 'set_lecturer'
         end
       end
-      resources :lvas  do 
+      resources :lvas  do
         member do
           get 'beispiel_sammlung'
           get 'compare_tiss'
@@ -130,8 +131,8 @@ end
         end
         resources :beispiele#, :only=>[:show,:index,:create]
 
-      end 
-      
+      end
+
       resources :fetzneditions
       resources :galleries do
         collection do
@@ -139,14 +140,14 @@ end
         end
         resources :fotos
       end
-      
-      resources :gremien do 
-        collection do 
+
+      resources :gremien do
+        collection do
           get 'verwalten'
         end
       end
 #      resources :fetprofiles, as: :fetprofiles_bak do
-#        collection do 
+#        collection do
 #          get 'verwalten'
 #          get 'internlist'
 #        end
@@ -158,12 +159,12 @@ end
         end
       end
       resources :fragen, :only =>[:new, :edit, :update, :destroy, :create]
-      
 
-      resources :neuigkeiten, :only => [:show] , constraints: {id: /\d+/i}    
+
+      resources :neuigkeiten, :only => [:show] , constraints: {id: /\d+/i}
       get "neuigkeiten", controller: :rubriken, action: :index, as: "neuigkeiten"
       resources :rubriken do
-        collection do 
+        collection do
           get 'verwalten' , :action => :alle_verwalten
           get 'intern'
         end
@@ -173,7 +174,7 @@ end
           get 'removemoderator'
         end
 
-        resources :neuigkeiten, :except => [:index] do 
+        resources :neuigkeiten, :except => [:index] do
           member do
             get 'publish'
             get 'unpublish'
@@ -197,7 +198,7 @@ end
         collection do
           get 'intern'
           get 'treeview'
-          get 'admin'   
+          get 'admin'
           get 'dev'
           get 'startdev'
           get 'linksnotimplemented'
@@ -208,14 +209,14 @@ end
       end
 
       resources :themengruppen do
-        get :verwalten 
+        get :verwalten
         get :verwalten_all,:on=>:collection
         get :faqs, :on=>:collection
         post :sort_themen
         post :sort_themengruppen, :on=>:collection
         resources :themen, :only=>[:new, :show]
       end
-      
+
       resources :themen do
         member do
           get :attachments
@@ -227,14 +228,14 @@ end
           get :meetings
         end
         resources :attachments do
-          member do 
+          member do
             get :set_titlepic
           end
         end
-        
+
       end
       resources :attachments do
-        member do 
+        member do
           get :set_titlepic
         end
         collection do
@@ -260,12 +261,12 @@ end
         member do
           get :announce
           get :create_protocol
-          get :create_agenda 
+          get :create_agenda
         end
-        
+
       end
-      
-    
+
+
       resources :meetingtyps do
         member do
           get :create_protocol_and_agenda
@@ -275,5 +276,3 @@ end
   end
   root :to => 'home#index'
 end
-
-