no longer ignore Gemfile.lock and adding Gemfile.lock

.gitignore

@@ -28,7 +28,7 @@
 /db/schema.rb
 /db/structure.sql
 /config/initializers/devise.rb
-Gemfile.lock
+
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
@@ -40,15 +40,19 @@ console
 /server
 /public/uploads/
 /public/sitemap*
+/public/assets/
 /vendor/*
 /bak/*
 /solr/*
 /log/*
 *#
-Gemfile.lock
+
 /config/database.yml
 /config/start_topic.yml
 /config/contact_topic.yml
+/config/etherpad/APIKEY.*
+/config/page.yml
+
 .#*
 .*
 !/.gitignore

Gemfile.lock

@@ -0,0 +1,449 @@
+GIT
+  remote: git://github.com/matenia/bootstrap-kaminari-views.git
+  revision: 9df61d400fc144c3f33d65f3f97e4867b8e68273
+  specs:
+    bootstrap-kaminari-views (0.0.5)
+      kaminari (>= 0.13)
+      rails (>= 3.1)
+
+GIT
+  remote: git://github.com/rgrove/sanitize
+  revision: acc7e6440139379a0c6b4b76b662ed90acd4b923
+  specs:
+    sanitize (4.6.4)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.4.4)
+      nokogumbo (~> 1.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    active_record_query_trace (1.5.4)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    acts_as_votable (0.11.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    aes_key_wrap (1.0.1)
+    annotate (2.6.10)
+      activerecord (>= 3.2, <= 4.3)
+      rake (~> 10.4)
+    arel (3.0.3)
+    attr_required (1.0.1)
+    awesome_nested_set (2.1.6)
+      activerecord (>= 3.0.0)
+    bcrypt (3.1.11)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
+    bindata (2.4.3)
+    blueimp-gallery (2.11.0.1)
+      railties (>= 3.1.0)
+    blueimp-gallery-rails (2.7.0)
+      railties (>= 3.0, < 5.0)
+    bootstrap-addons-rails (0.1.2)
+      rails
+    bootstrap-sass (2.3.2.2)
+      sass (~> 3.2)
+    builder (3.0.4)
+    cancan (1.6.10)
+    capybara (2.5.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    carrierwave (0.9.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+    chronic (0.10.2)
+    climate_control (0.2.0)
+    cocaine (0.5.8)
+      climate_control (>= 0.0.3, < 1.0)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    crass (1.0.4)
+    devise (2.2.8)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
+    diff-lcs (1.3)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    erubis (2.7.0)
+    etherpad-lite (0.3.0)
+      rest-client (>= 1.6)
+    execjs (1.4.1)
+      multi_json (~> 1.0)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
+    faraday (0.12.2)
+      multipart-post (>= 1.2, < 3)
+    fb_graph (2.7.17)
+      httpclient (>= 2.4)
+      multi_json (>= 1.3)
+      rack-oauth2 (>= 0.14.4)
+      tzinfo
+    ffi (1.9.23)
+    font-awesome-rails (4.7.0.4)
+      railties (>= 3.2, < 6.0)
+    formtastic (2.2.1)
+      actionpack (>= 3.0)
+    formtastic-bootstrap (3.0.0)
+      formtastic (>= 2.2)
+    git (1.3.0)
+    globalize (3.0.5)
+      activemodel (>= 3.0.0, < 4.0.0)
+      activerecord (>= 3.0.0, < 4.0.0)
+    globalize-accessors (0.1.5)
+      globalize (>= 3)
+    globalize-versioning (0.2.0)
+      activemodel (>= 3.2.0, < 5)
+      activerecord (>= 3.2.0, < 5)
+      globalize (>= 3.0.4, < 6)
+      paper_trail (>= 3.0.0, < 5)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
+    hashie (3.5.7)
+    highline (1.7.10)
+    hike (1.2.3)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-datetimepicker-rails (2.4.1.0)
+    jquery-fileupload-rails (0.4.1)
+      actionpack (>= 3.1)
+      railties (>= 3.1)
+    jquery-rails (3.1.5)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.1.2)
+      railties (>= 3.1.0)
+    json (2.1.0)
+    json-jwt (1.9.4)
+      activesupport
+      aes_key_wrap
+      bindata
+    jwt (1.5.6)
+    kaminari (0.17.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    kgio (2.11.2)
+    libv8 (3.16.14.19)
+    mail (2.5.5)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    meta-tags (2.9.0)
+      actionpack (>= 3.2.0, < 5.3)
+    mime-types (1.25.1)
+    mini_portile2 (2.3.0)
+    minitest (4.7.5)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    mysql2 (0.3.21)
+    net-ldap (0.16.1)
+    netrc (0.11.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    nokogumbo (1.5.0)
+      nokogiri
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
+      rack (~> 1.0)
+    omniauth-facebook (2.0.1)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-ldap (1.0.5)
+      net-ldap (~> 0.12)
+      omniauth (~> 1.0)
+      pyu-ruby-sasl (~> 0.0.3.2)
+      rubyntlm (~> 0.3.4)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.2)
+    opengraph_parser (0.2.3)
+      addressable
+      nokogiri
+    options (2.3.2)
+    orm_adapter (0.5.0)
+    paper_trail (3.0.9)
+      activerecord (>= 3.0, < 5.0)
+      activesupport (>= 3.0, < 5.0)
+    paperclip (3.4.2)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.0)
+      mime-types
+    polyglot (0.3.5)
+    pr_geohash (1.0.0)
+    progress_bar (1.2.0)
+      highline (~> 1.6)
+      options (~> 2.3.0)
+    public_suffix (3.0.2)
+    pyu-ruby-sasl (0.0.3.3)
+    rack (1.4.7)
+    rack-cache (1.7.2)
+      rack (>= 0.4)
+    rack-oauth2 (1.9.2)
+      activesupport
+      attr_required
+      httpclient
+      json-jwt (>= 1.9.0)
+      rack
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    raindrops (0.19.0)
+    rake (10.5.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rdoc (3.9.5)
+    ref (2.0.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rmagick (2.16.0)
+    rolify (4.0.0)
+    rsolr (2.2.1)
+      builder (>= 2.1.2)
+      faraday (>= 0.9.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-activemodel-mocks (1.0.3)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      rspec-mocks (>= 2.99, < 4.0)
+    rspec-collection_matchers (1.1.3)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-html-matchers (0.7.3)
+      nokogiri (~> 1)
+      rspec (>= 3.0.0.a, < 4)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-rails (3.3.3)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    rubyntlm (0.3.4)
+    rubyzip (1.2.1)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    seed_dump (0.5.3)
+    shareable (1.1.4)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    simple_calendar (0.1.11)
+      rails (>= 3.0)
+    sitemap_generator (6.0.1)
+      builder (~> 3.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.13)
+    sunspot (2.3.0)
+      pr_geohash (~> 1.0)
+      rsolr (>= 1.1.1, < 3)
+    sunspot_rails (2.3.0)
+      rails (>= 3)
+      sunspot (= 2.3.0)
+    sunspot_solr (2.3.0)
+    sunspot_test (0.4.1)
+      sunspot_rails (>= 2.1.1)
+      sunspot_solr
+    temple (0.8.0)
+    themes_for_rails (0.5.1)
+      rails (>= 3.0.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
+      ref
+    thor (0.20.0)
+    tilt (1.4.1)
+    tinymce-rails (4.1.10)
+      railties (>= 3.1.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.54)
+    uglifier (4.1.10)
+      execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    unicorn (4.8.3)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
+    warden (1.2.7)
+      rack (>= 1.0)
+    webrick (1.3.1)
+    whenever (0.10.0)
+      chronic (>= 0.6.3)
+    xpath (2.1.0)
+      nokogiri (~> 1.3)
+    yaml_db (0.6.0)
+      rails (>= 3.0, < 5.2)
+      rake (>= 0.8.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_record_query_trace
+  acts_as_votable
+  annotate (~> 2.6.0)
+  awesome_nested_set
+  blueimp-gallery
+  blueimp-gallery-rails
+  bootstrap-addons-rails
+  bootstrap-kaminari-views!
+  bootstrap-sass (~> 2.3.2.1)
+  cancan (~> 1.6.0)
+  capybara (~> 2.5.0)
+  carrierwave (~> 0.9.0)
+  coffee-rails (~> 3.0)
+  devise (~> 2.2.3)
+  etherpad-lite
+  execjs (~> 1.4.0)
+  factory_girl_rails (~> 4.5.0)
+  fb_graph (~> 2.7.17)
+  font-awesome-rails
+  formtastic (~> 2.2.1)
+  formtastic-bootstrap (~> 3.0.0)
+  git
+  globalize (~> 3.0.4)
+  globalize-accessors
+  globalize-versioning
+  haml
+  jquery-datetimepicker-rails
+  jquery-fileupload-rails (= 0.4.1)
+  jquery-rails
+  jquery-ui-rails (~> 4.1.0)
+  kaminari
+  meta-tags
+  minitest (~> 4.7.5)
+  mysql2 (~> 0.3.10)
+  omniauth (~> 1.2.2)
+  omniauth-facebook (~> 2.0.0)
+  omniauth-ldap (~> 1.0.4)
+  opengraph_parser
+  paper_trail (~> 3.0.5)
+  paperclip (~> 3.4.0)
+  progress_bar
+  rails (= 3.2.13)
+  rake (~> 10.0)
+  rmagick
+  rolify (~> 4.0.0)
+  rspec-activemodel-mocks (~> 1.0.1)
+  rspec-collection_matchers (~> 1.1.2)
+  rspec-core (~> 3.3.0)
+  rspec-expectations (~> 3.3.1)
+  rspec-html-matchers (~> 0.7.0)
+  rspec-rails (~> 3.3.0)
+  rspec-support (~> 3.3.0)
+  rubyzip
+  sanitize!
+  sass-rails (~> 3.0)
+  seed_dump (~> 0.5.3)
+  shareable
+  simple_calendar (~> 0.1.9)
+  sitemap_generator
+  sprockets (= 2.2.2)
+  sqlite3
+  sunspot_rails
+  sunspot_solr
+  sunspot_test
+  themes_for_rails
+  therubyracer
+  tinymce-rails (~> 4.1.0)
+  uglifier (>= 1.0.3)
+  unicorn (~> 4.8.0)
+  webrick (= 1.3.1)
+  whenever
+  yaml_db
+
+BUNDLED WITH
+   1.16.1

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/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" %>

config/sunspot.yml

@@ -3,6 +3,8 @@ production:
     hostname: localhost
     port: 8080
     log_level: WARNING
+    min_memory: 32M 
+    max_memory: 1G
     path: /solr-4.10.2/default #production #ollection1 #production
 #    solr_home: solr
     # read_timeout: 2
@@ -14,6 +16,8 @@ development:
     port: 8080
     log_level: INFO
     path: /solr/mycore
+    min_memory: 32M
+    max_memory: 1G
 #  solr:
 #    hostname: localhost
 #    port: 8983

test.tmp

@@ -1 +0,0 @@
-test