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

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-gem 'rake', '~>11.0'
+gem 'rake', '~>10.0'
 gem 'rails', '3.2.13'
 gem 'sprockets', '2.2.2'
 gem 'webrick', '1.3.1'
@@ -33,7 +33,7 @@ gem 'jquery-rails'
 # gem 'jbuilder'
 
 # Use unicorn as the app server
- gem 'unicorn'
+ gem 'unicorn', '~>4.8.0'
 
 # Deploy with Capistran
 # gem 'capistrano'
@@ -82,7 +82,7 @@ gem 'haml'
 #gem 'wikicloth'
 #gem 'gollum-lib'
 gem 'awesome_nested_set'
-gem 'annotate', ">=2.5.0"
+gem 'annotate', "~>2.6.0"
 gem 'carrierwave', "~>0.9.0"
 group :development, :test do 
 gem 'factory_girl_rails',"~>4.5.0"

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/assets/stylesheets/infoscreenframe.css

@@ -101,7 +101,7 @@ p {
 .footer .servicecontainer .servicestatus{
     margin: auto;
     width:20px;
-    height: 100%
+    height: 100vh; /* height: 100%;*/
     padding-right: 30px;
     background-color: #fff;
 }

app/controllers/application_controller.rb

@@ -9,11 +9,9 @@
     if params[:locale]
       if I18n.available_locales.include?(params[:locale].to_sym)
         session[:locale] = params[:locale]
-
       else
         flash.now[:notice]= "#{params[:locale]} translation not available"
         logger.error flash.now[:notice]
-
       end
     end
     http_header=request.env['HTTP_ACCEPT_LANGUAGE']
@@ -22,8 +20,8 @@
     else
       ht=nil
     end
-    I18n.locale = session[:locale] || ht || I18n.default_locale
-    
+    I18n.locale = session[:locale]  || I18n.default_locale
+    # removed ht from selection add || ht to check http header
 
     session[:locale] = I18n.locale
   end

app/controllers/home_controller.rb

@@ -25,11 +25,6 @@ class HomeController < ApplicationController
     @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)
@@ -121,4 +116,5 @@ 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

@@ -16,9 +16,6 @@ class Ability
     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

app/views/beispiele/_beispiel.html.erb

@@ -1,31 +1,20 @@
 <div id="<%= beispiel.divid %>" class="contentbox">
   <div class="row-fluid">
-    <div class="span6" >
+    <div class="span5" >
       <b><%=link_to ffi1_icon("note20")+" " + beispiel.name + " " + I18n.l(beispiel.datum), beispiel.beispieldatei.url, title: beispiel.desc  %></b>
     </div>
     <div class="span1" >
       <%= (beispiel.beispieldatei.size/1024.0).round(2).to_s  %>KiB   
     </div>
-    <div class="span5">
-
-      <%= 
-	 if can?(:like, beispiel)
-	 link_to ffi1_icon("like3")+" like" + "("+beispiel.get_likes.size.to_s+")", like_beispiel_path(beispiel),title: "liked by " + ((current_user.liked?(beispiel)) ? ("you and " + ((beispiel.get_likes.size - 1).to_s + " others")) :  beispiel.get_likes.size.to_s), remote: true  
-	 else
-	 "liked by " + beispiel.get_likes.size.to_s
-	 end
-	 %>
-
-	<%= 
-	   if can?(:dislike, beispiel)
-	   link_to ffi1_icon("dislike")+" dislike" + "("+beispiel.get_dislikes.size.to_s+")", dislike_beispiel_path(beispiel),title:"disliked by " + ((current_user.disliked?(beispiel)) ? ("you and " + ((beispiel.get_dislikes.size - 1).to_s + " others")) :  beispiel.get_dislikes.size.to_s) , remote: true
-	   else
-	   "disliked by " + beispiel.get_dislikes.size.to_s
-	   end
-
-	   %>
-
-	<%= link_to ff_icon("icon-pencil")+"edit", edit_beispiel_path(beispiel) if can? :edit, beispiel%>
+		<div class="span2" >
+			<%= beispiel.lecturer.try(:name).to_s %>
+		</div>
+    <div class="span4">
+			<%= flag_link(beispiel, "goodquality")%>
+			<%= flag_link(beispiel, "badquality")%>
+			<%= flag_link(beispiel, "delete")%>
+			<%= like_dislike_for(beispiel) %>
+			<%= link_to ff_icon("icon-pencil")+"edit", edit_beispiel_path(beispiel), remote: true if can? :edit, beispiel %>
 			<%= link_to fa_icon("trash")+"delete",  beispiel_path(beispiel), :method=>:delete, :data=>{:confirm=>I18n.t('beispiel.sure')} if can? :delete, beispiel %>
 			<% link_to "Refresh", beispiel_path(beispiel,show_comments: true), remote: true %></br>
     </div>
@@ -39,4 +28,5 @@
   </div>
   <% end %>
 
+<%= render_comments_for(beispiel) %>
 </div>

app/views/devise/sessions/new.html.erb

@@ -9,7 +9,8 @@
     </li>
 </ul>
 </p>
-<!--<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
   <div><%= f.label :email %><br />
   <%= f.email_field :email, :autofocus => true %></div>
 
@@ -23,6 +24,6 @@
   <div><%= f.submit "Sign in" %></div>
 <% end %>
 
--->
+
 
 <%= render "devise/shared/links" %>

app/views/fetprofiles/show.html.erb

@@ -65,5 +65,13 @@ end
     </div>
   </div>
 </div>
-      <%= render 'layouts/pretty_toolbar' %>
+<% if can?(:edit, @fetprofile) %>
+<div>
+	<span>
+	 <%= link_to ff_icon("icon-pencil")+I18n.t('common.edit'), edit_fetprofile_path(@fetprofile) if can?(:edit, @fetprofile) %>
+	 <%= link_to fa_icon("trash")+I18n.t('common.delete'), fetprofile_path(@fetprofile),method: :delete, data: { confirm: "Are you sure?" } if can?(:delete, @fetprofile) %>
+	</span>
+</div>
+<% end  %>
+      <%#= render 'layouts/pretty_toolbar' %>
 </div>

app/views/home/index.html.erb

@@ -7,53 +7,61 @@
   fjs.parentNode.insertBefore(js, fjs);
 }(document, 'script', 'facebook-jssdk'));</script>
 
-<div class="content-wrap content-column" style="max-width:100em;">
+<div class="content-wrap content-column" style="max-width:90em;">
  <h1><%= I18n.t('home.willkommen') %></h1>
-<%= render partial: "themen/small", object: @starttopic %>
+<%= raw(@starttopic.text) unless @starttopic.nil? %>
+
+
 <div class="container-fluid">
 <div class="row-fluid">
-<div class="span5">
+<div class="span4">
   
   <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>  
       <%= 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>
+    <li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox if Studium.count > 0 %></li>
     <li><%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %></li>
   </ul>
-  <ul>
+
+<% cache("stickytopics_startpage_"+cache_array_key(@stickythemen)) do %>
+  <ul class="linklist">
     <% @stickythemen.each do |t1| %>
     <li>
-      <%= link_to t1 do %>
-      <%= render partial: "themen/nlink", object: t %>
-      <%= end %>
+      <%= link_to t1,:class=>:linkbox do %>
+      <%= render partial: "themen/nlink", object: t1 %>
+      <% end %> 
     </li>
     <% end %>
   </ul>
-
+<% end %> 
 <%= 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;">
+
+<div class="span5">
+  <ul class="unstyled linkbox-list">
 	<% @neuigkeiten.each do |n| %>
 	<li><%= render n if can?(:show, n) %> </li>
 	<% end %>
   </ul>
-Verschiedene Styles
-<ul>
-<li> <%= link_to "Darkblue", home_index_path({:theme=>"darkblue"}) %></li>
-<li> <%= link_to "Blue1", home_index_path({:theme=>"blue1"}) %></li>
+</div>
 
-<li> <%= link_to "2003", home_index_path({:theme=>"2003"}) %></li>
-<li> <%= link_to "white_1", home_index_path({:theme=>"white_1"}) %></li>
-</ul>
+<div class="span3">
+<% cache("calendar_" + cache_array_key(@calentries)+params[:month].to_s+params[:year].to_s) do %>
+<%= render 'calendars/calentries', :object=>@calentries %>
+<% end %>
 
+
+<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>
 </div>
 </div>
+

app/views/home/intern.html.erb

@@ -1,15 +1,41 @@
-<h1> FET Intern NEU </h1>
+<h1> FET Intern NEU blue2</h1>
 <div class="container-fluid">
   <div class="row-fluid">
     <div class="span6">
+			<div>
 			<ul class="linklist">
 				<li>
-      <%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %></li>
- <li>     <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
+					<%= link_to fa_icon("list")+"Adressliste", internlist_fetprofiles_path ,class: :linkbox %>
 				</li>
 				<li>     
-<%= link_to ff_icon("ffi1-setting")+"Neue Oberfläche" , set_preferred_theme_user_path(current_user, params: {theme: "blue2"}), class: :linkbox if can? :set_preferred_theme , current_user %>
-</li></ul>
+					<%= link_to ff_icon("ffi1-setting")+"Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
+				</li>
+				<li>     
+					<%= link_to ff_icon("fa fa-folder")+"Treeview" , treeview_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
+				</li>
+				<li>     
+					<%= link_to ff_icon("ffi1-newspaper9")+"Crawler" , crawler_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
+				</li>
+<li>     
+					<%= link_to ff_icon("ffi1-setting")+"Meetings" , meetingtyps_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
+				</li>
+<li>     
+					<%= link_to ff_icon("ffi1-setting")+"Alte Oberfläche" , set_preferred_theme_user_path(current_user, params: {theme: "blue1"}), class: :linkbox if can? :set_preferred_theme, current_user %>
+				</li>
+
+			</ul><br>
+		</div>
+			<div>Suche nach Protokollen
+				<%= semantic_form_for :search,:remote=>true, :url=>search_documents_path, :html=>{:id=>"search_form",:class=>"", :method=>'get'} do |f| %>
+					<%= f.input :query, :input_html => { :name => 'query' } , :label=>false, :class=>"search-query" %>
+					<% f.actions do %>
+						<% f.action :submit, :as => :input %>
+					<% end %>
+				<% end %>
+				<div id="searchresults">
+					<%= render :partial=>"documents/search_results", :object=>@results %>
+				</div>
+			</div>
       <ul class="unstyled linkbox-list">
 				<li>  
 					<% @themengruppen.each do |themengruppe| %>

app/views/home/verleihkalender.html.erb

@@ -1,18 +0,0 @@
-
-  <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>

app/views/layouts/application.html.erb

@@ -1,20 +1,15 @@
 <!DOCTYPE html>
 <html>
-
   <head>
+
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" href="https://www.fet.at/logo2014_64.png"> 
     
     <link rel="alternate" hreflang="de" href="<%= url_for(params.merge(:locale=>:de))%>" />
-
     <link rel="alternate" hreflang="en" href="<%= url_for(params.merge(:locale=>:en))%>" />
-    <!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
-    <!---->
 
       <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty?  %>
       <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
-    <% theme_stylesheet_link_tag "test", :media => "all" %>
-    <% theme_stylesheet_link_tag "mod", :media=>"all" %>
       <%= javascript_include_tag "application" %>
       <%= csrf_meta_tags %>
       <% if content_for?(:header) %>

app/views/layouts/menu.html.erb

@@ -43,9 +43,10 @@
 	<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
 	
 	</ul></div>
-	</li>
-	<%= render 'layouts/login' %>
-</ul>
+	</li><li>
+ <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap)  %>
+	<%# render 'layouts/login' %>
+</li></ul>
 
 	<!--<span class="pull-right"><%if I18n.locale == :en %>
 	  <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%>

app/views/lvas/show.html.erb

@@ -1,12 +1,10 @@
 <%= content_for :header do %>
 <title>Fetsite - <%=  @lva.full_name %></title>
 <% set_meta_tags :og => {
-													 :url=>lva_path(:theme=>nil) 
-													 }
+  :url=>lva_path(:theme=>nil) }
 %>
 <%= display_meta_tags %>
 <% end %>
-
 <div itemscope itemtype="schema.org/Article" >
   <div class="container-fluid">
     <%= render 'studien/tabs'%>
@@ -17,6 +15,7 @@
 	<%= render 'layouts/pretty_toolbar' %>
       </div>
     </div>
+
     <div class="row-fluid">
       <div class="span8">
 	<h1 itemprop="name"><%= @lva.full_name %></h1>
@@ -45,6 +44,7 @@
 	  <%= @lva.desc.to_s.html_safe %>
 	</div>
 	</div>
+
       </div>
       <div class="span4">
 	<div class="contentbox">
@@ -59,10 +59,12 @@
 	    <li><b><%= link_to modul.name , modul_path(modul)%></b>
 	      <ul>
 		<% modul.modulgruppen.each do |g| %>
+
 		<li><%= link_to g.studium.title_context , studium_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
 		<% end %>
 	      </ul>
 	    </li>
+	    
 	    <% end %>
 	  </ul>
 	</div>
@@ -70,34 +72,68 @@
 	  <h2> <%= I18n.t "lecturers.lecturers" %> </h2>
 	  <% @lva.lecturers.each do |lec| %>
 	  <%= render :partial=>'lecturers/lec_lva', :object=>lec %>
+
 	  <% end %>
 	</div>
       </div>
     </div>
+
+
     <div class="row-fluid">
       <div class="span12">
+		<%= new_question_for(@lva) %>
+		<% unless @questions.nil? %>
+		<% @questions.each do |q| %>
+			<%= render q if can? :show, q %>
+		<% end %>
+		<% end %>
+
 
 				<h2><%= I18n.t("lva.bspe") %></h2>
-				<p><%= I18n.t("lva.ratebsp")%>       <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
+				<p>
+					<%= I18n.t("lva.ratebsp")%>       
+					<%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
 				</p>
 				<%= link_to t("beispiel.zip") , beispiel_sammlung_lva_path(@lva), class: :linkbox %>
-				<% @beispiele_all.each do |b| %>
-					<% cache("beispiel_"  +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s+ can?(:comment, b).to_s + "_" + can?(:like, b).to_s +  "_" + b.updated_at.try(:utc).try(:to_s)  + get_theme_help(current_user).to_s) do %>
+				<% @beispiele.each do |b| %>
+	<% cache("beispiel_"  +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s +  "_" + b.updated_at.try(:utc).try(:to_s) + get_theme_help(current_user).to_s) do %>
 						<%= render b%>
 					<% end %>
 				<% end %>
+				<% if @beispiele_badQ.count > 0  %>
+				<h3> Bad Quality or Outdated</h3>
+				<% @beispiele_badQ.each do |b| %>
+	<% cache("beispiel_"  +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s +  "_" + b.updated_at.try(:utc).try(:to_s) + get_theme_help(current_user).to_s) do %>
+						<%= render b%>
+					<% end %>
+				<% end %>
+				<% end %>
+				<% if @beispiele_deleted.count > 0  %>
+				<h3> Trash</h3>
+				<% @beispiele_deleted.each do |b| %>
+
+	<% cache("beispiel_"  +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s +  "_" + b.updated_at.try(:utc).try(:to_s) +  get_theme_help(current_user).to_s) do %>
+						<%= render b%>
+					<% end %>
+				<% end %>				
+				<% end %>				
+	
       </div>
 			
     </div>
 
-    <div class="row-fluid"> <div class="span12">
+    <div class="row-fluid">
+      <div class="span12">
+
 	<% unless @lva.nlinks.empty? %> 
 	<h2><%= I18n.t("rubrik.title") %></h2>
 	<% @lva.nlinks.each do |l| %> 
 	<%= render l.neuigkeit %>
 	<% end %>
 	<% end %>
-    </div></div>
+
+      </div>
+    </div>
     <% cache("lva_beispiel_form_bulk_"+@lva.id.to_s+I18n.locale.to_s+@lva.updated_at.to_i.to_s) do %>
     <div class="row-fluid">
       <div class="span12">
@@ -106,6 +142,7 @@
     </div>
 
     <% end %>
+
     <% unless @crawlobjects.nil? %>
     <div class="row-fluid">
       <div class="span12">

app/views/neuigkeiten/_neuigkeit_view.html.erb

@@ -1,8 +1,21 @@
+<% if neuigkeit_view.nil? 
+neuigkeit_view=@neuigkeit
+end
+%>
 <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)%>"/>
+	<%= meta_itemprop("about", neuigkeit_view.text_first_words) %>
+  <%= meta_itemprop("sameAs", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
+	<%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
   
+	<div>
+<% cache("menu_neuigkeit"+ neuigkeit_view.id.to_s + can?(:edit,neuigkeit_view).to_s + can?(:find_link, neuigkeit_view).to_s + can?(:new, Survey::Question).to_s + can?(:publish, neuigkeit_view).to_s + can?(:unpublish, neuigkeit_view).to_s + neuigkeit_view.published?.to_s +  neuigkeit_view.flag_important.to_s  +  neuigkeit_view.flag_infoscreen.to_s)  do %>
+		<%= render partial: "menu" , object: neuigkeit_view%>		
+<%  end %>
+	</div>  
+	<div>
+
+		<%#= 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 %>
@@ -15,6 +28,7 @@
 				</span>
 			<% end %>
   </div>
+
   <% unless neuigkeit_view.published? %> 
     <div class="sticker sticker-red"> Not Published <%= link_to "Publish", publish_rubrik_neuigkeit_path(neuigkeit_view.rubrik,neuigkeit_view),remote:true, class: :btn if can? :publish, neuigkeit_view %></div> 
 	<% end %>
@@ -31,7 +45,7 @@
     <% 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 %>
+				<%= 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) %>
@@ -40,14 +54,19 @@
   </div>
 
 	<%= render_calentries_for(neuigkeit_view)%>
-	
+	<%= new_calentry_div(neuigkeit_view) %>	
 	<% unless neuigkeit_view.meeting.nil? %>
 		<%= render neuigkeit_view.meeting %>
 	<% end%>
 
 	
 
-	<%= render_attachments_for(neuigkeit_view) %>
+	<%= render_attachments_list_for(neuigkeit_view) %>
 
-	<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
 	</div>
+
+
+
+	<% @questions.each do |q| %>
+		<%= render q if can? :show, q %>
+	<% end %>

app/views/neuigkeiten/show.html.erb

@@ -38,17 +38,13 @@
 	</p>
 	<%= render partial: "neuigkeit_view", object: @neuigkeit %>
 
-<%= new_question_for(@neuigkeit) if can? :new, Survey::Question %>
-	<% @questions.each do |q| %>
-		<%= render q if can? :show, q %>
-	<% end %>
-
-
 </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>
 
+<%= render_comments_for(@neuigkeit) %>
+
+<%# link_to fa_icon("link") + "Neue Verknüpfung" , "#", id: "findlink-open" if can? :find_link, @neuigkeit %>
 
-<%= 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  %>
@@ -62,6 +58,7 @@
 		<%= render partial: 'nlink_list_search_whole', object: @nlink_search %>
 	<% end %>
 </div>
+
 <script>
 $(function(){
   dialog = $( "#findlink-body" ).dialog({

app/views/rubriken/index.html.erb

@@ -33,7 +33,7 @@
 				</div>
 
 			</div>
-			<% unless @calentries.nil? or @calentries.empty? or True%>
+			<% unless @calentries.nil? or @calentries.empty? or true%>
 			<div class="span3">
 <% unless @calentries.nil? or @calentries.empty? %>
 				<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>

app/views/themes/blue2/beispiele/_beispiel.html.erb

@@ -1,32 +0,0 @@
-<div id="<%= beispiel.divid %>" class="contentbox">
-  <div class="row-fluid">
-    <div class="span5" >
-      <b><%=link_to ffi1_icon("note20")+" " + beispiel.name + " " + I18n.l(beispiel.datum), beispiel.beispieldatei.url, title: beispiel.desc  %></b>
-    </div>
-    <div class="span1" >
-      <%= (beispiel.beispieldatei.size/1024.0).round(2).to_s  %>KiB   
-    </div>
-		<div class="span2" >
-			<%= beispiel.lecturer.try(:name).to_s %>
-		</div>
-    <div class="span4">
-			<%= flag_link(beispiel, "goodquality")%>
-			<%= flag_link(beispiel, "badquality")%>
-			<%= flag_link(beispiel, "delete")%>
-			<%= like_dislike_for(beispiel) %>
-			<%= link_to ff_icon("icon-pencil")+"edit", edit_beispiel_path(beispiel), remote: true if can? :edit, beispiel %>
-			<%= link_to fa_icon("trash")+"delete",  beispiel_path(beispiel), :method=>:delete, :data=>{:confirm=>I18n.t('beispiel.sure')} if can? :delete, beispiel %>
-			<% link_to "Refresh", beispiel_path(beispiel,show_comments: true), remote: true %></br>
-    </div>
- </div>
-  <% unless beispiel.desc.nil? || beispiel.desc.empty? %>
-  <div class="row-fluid">
-    <div class="span12">
-      
-      <%= beispiel.desc %>
-    </div>
-  </div>
-  <% end %>
-
-<%= render_comments_for(beispiel) %>
-</div>

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

@@ -1,77 +0,0 @@
-<%= content_for :header do %>
-<title>FET - <%=  @fetprofile.name %></title>
-<% unless @fetprofile.picture.url.nil?
-   picture_url=URI(root_url)
-   picture_url.path=@fetprofile.picture.portrait.url
-end
-%>
-
-<% set_meta_tags :og => {
-    :image => picture_url.to_s,
-    :title => @fetprofile.name.to_s ,
-    :type => "profile",
-    :url=>fetprofile_url(@fetprofile,:theme=>nil),
-:profile=> {
-  :first_name=>@fetprofile.vorname,
-  :last_name=>@fetprofile.nachname
-  }
-}
-%>
-<% 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 'fetprofiles/tabs' %>
-
-<div class="content-wrap content-column">
-
-<p id="notice"><%= notice %></p>
-<div style="max-width:70em" itemtype="http://schema.org/Person" itemscope>
-<meta itemprop="sameAs" content="<%= fetprofile_path(@fetprofile, theme: nil) %>"/>
-<meta itemprop="url" content="<%= fetprofile_path(@fetprofile, theme: nil) %>"/>
-  <div class="media">
-    <span class="pull-left" itemprop="image" itemscope itemtype="http://schema.org/ImageObject">
-      <span itemprop="thumbnail" itemscope itemtype="http://schema.org/ImageObject">
-	<%= image_tag @fetprofile.picture.portrait.url %>
-	<meta itemprop="url" content="<%= @fetprofile.picture.portrait.url%>" />    
-      </span>
-      <meta itemprop="url" content="<%= @fetprofile.picture.url%>" /> 
-      <meta itemprop="representativeOfPage" content="true" />
-    </span>
-    <div class="media-body">
-      <h2><span itemprop="givenName"><%= @fetprofile.vorname %></span><span itemprop="familyName"> <%= @fetprofile.nachname %></span><% unless @fetprofile.short.empty? %><span itemprop=""> <%= @fetprofile.short %> </span><% end %></h2>
-      <meta itemprop="name" content="<%= @fetprofile.name %>" /> 
-
-      <p itemprop="email">
-	<%= @fetprofile.fetmail %>
-      </p>
-      <p itemprop="description">
-	<%= @fetprofile.desc %>
-      </p>
-      <%= render partial: "interninfo", object: @fetprofile if can?(:seeintern, @fetprofile) %>
-	
-      <ul>
-	<% @memberships.each do |m| %>
-	<li>
-	  <%= link_to gremium_path(m.gremium) do %> <%= render m %><% end %>
-	  <%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>
-	  <%= link_to I18n.t('common.delete'), [@fetprofile, m], method: :delete, data: {confirm: I18n.t('common.sure_del')} if params["verwalten"] && can?(:delete, m ) %>
-	</li>
-	<% end %>
-      </ul>
-
-    </div>
-  </div>
-</div>
-<% if can?(:edit, @fetprofile) %>
-<div>
-	<span>
-	 <%= link_to ff_icon("icon-pencil")+I18n.t('common.edit'), edit_fetprofile_path(@fetprofile) if can?(:edit, @fetprofile) %>
-	 <%= link_to fa_icon("trash")+I18n.t('common.delete'), fetprofile_path(@fetprofile),method: :delete, data: { confirm: "Are you sure?" } if can?(:delete, @fetprofile) %>
-	</span>
-</div>
-<% end  %>
-      <%#= render 'layouts/pretty_toolbar' %>
-</div>

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

@@ -1,67 +0,0 @@
-<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) unless @starttopic.nil? %>
-
-
-<div class="container-fluid">
-<div class="row-fluid">
-<div class="span4">
-  
-  <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>  
-      <%= 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 if Studium.count > 0 %></li>
-    <li><%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %></li>
-  </ul>
-
-<% cache("stickytopics_startpage_"+cache_array_key(@stickythemen)) do %>
-  <ul class="linklist">
-    <% @stickythemen.each do |t1| %>
-    <li>
-      <%= link_to t1,:class=>:linkbox do %>
-      <%= render partial: "themen/nlink", object: t1 %>
-      <% end %> 
-    </li>
-    <% end %>
-  </ul>
-<% end %> 
-<%= render 'beispiele' %>
-
-</div>
-
-<div class="span5">
-  <ul class="unstyled linkbox-list">
-	<% @neuigkeiten.each do |n| %>
-	<li><%= render n if can?(:show, n) %> </li>
-	<% end %>
-  </ul>
-</div>
-
-<div class="span3">
-<% cache("calendar_" + cache_array_key(@calentries)+params[:month].to_s+params[:year].to_s) do %>
-<%= render 'calendars/calentries', :object=>@calentries %>
-<% end %>
-
-
-<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>
-</div>
-</div>
-

app/views/themes/blue2/home/intern.html.erb

@@ -1,62 +0,0 @@
-<h1> FET Intern NEU blue2</h1>
-<div class="container-fluid">
-  <div class="row-fluid">
-    <div class="span6">
-			<div>
-			<ul class="linklist">
-				<li>
-					<%= link_to fa_icon("list")+"Adressliste", internlist_fetprofiles_path ,class: :linkbox %>
-				</li>
-				<li>     
-					<%= link_to ff_icon("ffi1-setting")+"Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
-				</li>
-				<li>     
-					<%= link_to ff_icon("fa fa-folder")+"Treeview" , treeview_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
-				</li>
-				<li>     
-					<%= link_to ff_icon("ffi1-newspaper9")+"Crawler" , crawler_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
-				</li>
-<li>     
-					<%= link_to ff_icon("ffi1-setting")+"Meetings" , meetingtyps_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
-				</li>
-<li>     
-					<%= link_to ff_icon("ffi1-setting")+"Alte Oberfläche" , set_preferred_theme_user_path(current_user, params: {theme: "blue1"}), class: :linkbox if can? :set_preferred_theme, current_user %>
-				</li>
-
-			</ul><br>
-		</div>
-			<div>Suche nach Protokollen
-				<%= semantic_form_for :search,:remote=>true, :url=>search_documents_path, :html=>{:id=>"search_form",:class=>"", :method=>'get'} do |f| %>
-					<%= f.input :query, :input_html => { :name => 'query' } , :label=>false, :class=>"search-query" %>
-					<% f.actions do %>
-						<% f.action :submit, :as => :input %>
-					<% end %>
-				<% end %>
-				<div id="searchresults">
-					<%= render :partial=>"documents/search_results", :object=>@results %>
-				</div>
-			</div>
-      <ul class="unstyled linkbox-list">
-				<li>  
-					<% @themengruppen.each do |themengruppe| %>
-						<div class="container-fluid">
-							<%= render themengruppe if can?(:show,themengruppe)%>
-						</div>
-					<% end %>
-				</li>
-      </ul>
-
-      <%= link_to "Users", users_path %>
-    </div>
-    <div class="span6">
-      <h2>Neuigkeiten</h2>
-      <ul class="unstyled linkbox-list">	
-				<% @neuigkeiten.each do |n| %>
-					<li><%= render n if can?(:show, n) %></li>
-				<% end %>
-      </ul>
-    </div>
-  </div>
-</div>
-
-<h2></h2>

app/views/themes/blue2/layouts/application.html.erb

@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" href="https://www.fet.at/logo2014_64.png"> 
-    
-    <link rel="alternate" hreflang="de" href="<%= url_for(params.merge(:locale=>:de))%>" />
-    <link rel="alternate" hreflang="en" href="<%= url_for(params.merge(:locale=>:en))%>" />
-
-      <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty?  %>
-      <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
-      <%= javascript_include_tag "application" %>
-      <%= csrf_meta_tags %>
-      <% if content_for?(:header) %>
-	  <%= yield :header %>
-      <% else %>
-	  <title>Fetsite</title>
-      <% end  %>
-  </head>
-
-  <body>
-      <div id="maincontainer" class="container-fluid">
-	  <div class="row-fluid">
-	      <div class="span10 offset1 header_span">
-		  <% cache("menu_u"+user_signed_in?.to_s+current_user.try(:id).to_s+"l"+I18n.locale.to_s+ can?(:seeintern, User).to_s+ can?(:index,Gallery).to_s+params[:theme].to_s, expires_in: 24.hours) do %>
-		      <div class="header_wrap">
-			  <div class="header hidden-print">
-			      <%= link_to home_index_path do %>
-				  <!-- <span class="feticon-fet_logo fa-4x color-1"> </span>-->
-				  <%=  image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
-			      <% end %>
-			  </div>
-			  <div class="header visible-print">
-			      <%=  image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
-			  </div>
-			  <div class="visible-print">
-			      Fachschaft Elektrotechnik 
-			      <hr/>
-			  </div>
-			  <div id="menudiv" style="margin-top:12px" class="hidden-print">
-			      <%= render :template => 'layouts/menu' %>
-			  </div>
-			  
-		      </div>     
-		  <% end %>
-	      </div>
-	  </div>
-	  <div class="row-fluid">	
-	      <div class="span10 offset1" id="contentdiv">
-		  <%= yield %>
-	      </div>
-	  </div>    
-      </div>
-      <script>
-       $('.dropdown-toggle').click(function(e) {
-	   e.preventDefault();
-	   setTimeout($.proxy(function() {
-	       if ('ontouchstart' in document.documentElement) {
-		   $(this).siblings('.dropdown-backdrop').off().remove();
-	       }
-	   }, this), 0);
-       });
-      </script>
-  </body>
-</html>

app/views/themes/blue2/layouts/menu.html.erb

@@ -1,62 +0,0 @@
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-      <!--  <a class="brand" href="#"><% t 'home.mtitle'%></a>-->
-      <a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
-	<span class="icon-bar"></span>
-	<span class="icon-bar"></span>
-	<span class="icon-bar"></span>
-      </a>
-      <div class="nav-collapse collapse">
-	<ul class="nav nav-pills nav-stacked">
-	  <li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
-	  </li>
-	  <li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
-	    
-	  <li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %></li>
-	  <li><%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %></li>
-<% if can? :index, Gallery %>
-	  <li><%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %></li>
-<% end %>
-	  <li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %></li>
-	  <li> <%= link_to I18n.t("home.search"), search_home_index_path %></li>
-<li> <%= link_to I18n.t("home.kontakt"), kontakt_home_index_path %></li>
-	 <% if can?(:seeintern, User) %>
-	  <li>
-	    <%= link_to 'Intern' , intern_home_index_path  %>
-	  </li><% end %>
-	</ul>
-	<ul class="nav nav-pills nav-stacked pull-right">
-	<li>
-	  <!--<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" >	 <%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>-->
-	  <!-- Split button -->
-	  <div class="btn-group navbar-btn">
-	    <button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" aria-expanded="false">
-	      <%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%>
-	    </button>
-	    <button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" data-toggle="dropdown" >
-	      <span class="caret"></span>
-	    </button>
-	<ul class="dropdown-menu" role="menu">	 
-	<li><%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> </li>
-	
-	<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
-	
-	</ul></div>
-	</li>
-	<%= render 'layouts/login' %>
-</ul>
-
-	<!--<span class="pull-right"><%if I18n.locale == :en %>
-	  <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%>
-	  <% elsif I18n.locale == :de %>
-	  <%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%>
-	  <%end %>
-	</span>-->
-
-      </div>
-
-    </div>
-  </div>
-</div>
-

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

@@ -1,158 +0,0 @@
-<%= content_for :header do %>
-<title>Fetsite - <%=  @lva.full_name %></title>
-<% set_meta_tags :og => {
-  :url=>lva_path(:theme=>nil) }
-%>
-<%= display_meta_tags %>
-<% end %>
-<div itemscope itemtype="schema.org/Article" >
-  <div class="container-fluid">
-    <%= render 'studien/tabs'%>
-    <p id="notice"><%= notice %></p>
-    
-    <div class="row-fluid">
-      <div class="span12">
-	<%= render 'layouts/pretty_toolbar' %>
-      </div>
-    </div>
-
-    <div class="row-fluid">
-      <div class="span8">
-	<h1 itemprop="name"><%= @lva.full_name %></h1>
-	<meta itemprop="url" content="<%= lva_path(@lva) %>" />
-	<ul class="linklist">
-	  <li>
-	    <%= link_to ffi1_icon("live2")+"ET-Forum", @lva.forumlink, class: :linkbox, itemprop: "discussionUrl" unless @lva.forumlink.nil? or @lva.forumlink.empty?%>
-	  </li>
-	  <li>
-	    <%= link_to "TISS", @lva.tisslink, class: :linkbox %>
-	  </li>
-	</ul>
-	<div itemprop="articleBody">
-	<h2><%= I18n.t('lva.pruefungsinfo')%></h2>
-	<div class="">
-	  <%= @lva.pruefungsinformation.to_s.html_safe %>
-	</div>
-
-	<h2><%= I18n.t('lva.lernaufwand')%></h2>
-	<div class="">
-	  <%= @lva.lernaufwand %>
-	</div>
-
-	<h2><%= I18n.t('lva.desc')%></h2>
-	<div class="">
-	  <%= @lva.desc.to_s.html_safe %>
-	</div>
-	</div>
-
-      </div>
-      <div class="span4">
-	<div class="contentbox">
-	  <ul>
-	    <li><b><%= I18n.t('lva.lvanr')%>:</b> <%=@lva.lvanr %></li>
-	    <li><b>ECTS:</b> <%=@lva.ects %></li>
-	    <li><b><%= I18n.t('lva.stunden')%>:</b> <%=@lva.stunden %></li>
-	  </ul>
-	  <h2><%= I18n.t('lva.module')%></h2>
-	  <ul>
-	    <% @lva.modul.each do |modul| %>
-	    <li><b><%= link_to modul.name , modul_path(modul)%></b>
-	      <ul>
-		<% modul.modulgruppen.each do |g| %>
-
-		<li><%= link_to g.studium.title_context , studium_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
-		<% end %>
-	      </ul>
-	    </li>
-	    
-	    <% end %>
-	  </ul>
-	</div>
-	<div class="contentbox">
-	  <h2> <%= I18n.t "lecturers.lecturers" %> </h2>
-	  <% @lva.lecturers.each do |lec| %>
-	  <%= render :partial=>'lecturers/lec_lva', :object=>lec %>
-
-	  <% end %>
-	</div>
-      </div>
-    </div>
-
-
-    <div class="row-fluid">
-      <div class="span12">
-		<%= new_question_for(@lva) %>
-		<% unless @questions.nil? %>
-		<% @questions.each do |q| %>
-			<%= render q if can? :show, q %>
-		<% end %>
-		<% end %>
-
-
-				<h2><%= I18n.t("lva.bspe") %></h2>
-				<p>
-					<%= I18n.t("lva.ratebsp")%>       
-					<%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
-				</p>
-				<%= link_to t("beispiel.zip") , beispiel_sammlung_lva_path(@lva), class: :linkbox %>
-				<% @beispiele.each do |b| %>
-	<% cache("beispiel_"  +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s +  "_" + b.updated_at.try(:utc).try(:to_s) + get_theme_help(current_user).to_s) do %>
-						<%= render b%>
-					<% end %>
-				<% end %>
-				<% if @beispiele_badQ.count > 0  %>
-				<h3> Bad Quality or Outdated</h3>
-				<% @beispiele_badQ.each do |b| %>
-	<% cache("beispiel_"  +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s +  "_" + b.updated_at.try(:utc).try(:to_s) + get_theme_help(current_user).to_s) do %>
-						<%= render b%>
-					<% end %>
-				<% end %>
-				<% end %>
-				<% if @beispiele_deleted.count > 0  %>
-				<h3> Trash</h3>
-				<% @beispiele_deleted.each do |b| %>
-
-	<% cache("beispiel_"  +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s +  "_" + b.updated_at.try(:utc).try(:to_s) +  get_theme_help(current_user).to_s) do %>
-						<%= render b%>
-					<% end %>
-				<% end %>				
-				<% end %>				
-	
-      </div>
-			
-    </div>
-
-    <div class="row-fluid">
-      <div class="span12">
-
-	<% unless @lva.nlinks.empty? %> 
-	<h2><%= I18n.t("rubrik.title") %></h2>
-	<% @lva.nlinks.each do |l| %> 
-	<%= render l.neuigkeit %>
-	<% end %>
-	<% end %>
-
-      </div>
-    </div>
-    <% cache("lva_beispiel_form_bulk_"+@lva.id.to_s+I18n.locale.to_s+@lva.updated_at.to_i.to_s) do %>
-    <div class="row-fluid">
-      <div class="span12">
-	<%= render 'beispiele/form_bulk' %>
-      </div>
-    </div>
-
-    <% end %>
-
-    <% unless @crawlobjects.nil? %>
-    <div class="row-fluid">
-      <div class="span12">
-	<% @crawlobjects.each do |co| %>
-	<%= render co %>
-	<% end %>
-      </div>
-    </div>
-    <% end %>
-
-  </div>
-</div>
-

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

@@ -1,72 +0,0 @@
-<% if neuigkeit_view.nil? 
-neuigkeit_view=@neuigkeit
-end
-%>
-<div id="neuigkeit_<%= neuigkeit_view.id %>" class="contentbox" itemscope itemtype="http://schema.org/Article">
-	<%= meta_itemprop("about", neuigkeit_view.text_first_words) %>
-  <%= meta_itemprop("sameAs", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
-	<%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
-  
-	<div>
-<% cache("menu_neuigkeit"+ neuigkeit_view.id.to_s + can?(:edit,neuigkeit_view).to_s + can?(:find_link, neuigkeit_view).to_s + can?(:new, Survey::Question).to_s + can?(:publish, neuigkeit_view).to_s + can?(:unpublish, neuigkeit_view).to_s + neuigkeit_view.published?.to_s +  neuigkeit_view.flag_important.to_s  +  neuigkeit_view.flag_infoscreen.to_s)  do %>
-		<%= render partial: "menu" , object: neuigkeit_view%>		
-<%  end %>
-	</div>  
-	<div>
-
-		<%#= 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_view.rubrik,neuigkeit_view),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)%>
-	<%= new_calentry_div(neuigkeit_view) %>	
-	<% unless neuigkeit_view.meeting.nil? %>
-		<%= render neuigkeit_view.meeting %>
-	<% end%>
-
-	
-
-	<%= render_attachments_list_for(neuigkeit_view) %>
-
-	</div>
-
-
-
-	<% @questions.each do |q| %>
-		<%= render q if can? :show, q %>
-	<% end %>

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

@@ -1,77 +0,0 @@
-<%= 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>
-
-<%= render_comments_for(@neuigkeit) %>
-
-<%# 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>

config/routes.rb

@@ -80,7 +80,6 @@ end
       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
@@ -276,3 +275,5 @@ end
   end
   root :to => 'home#index'
 end
+
+

config/sunspot.yml

@@ -3,7 +3,9 @@ production:
     hostname: localhost
     port: 8080
     log_level: WARNING
-    path: /solr/#/default #production #ollection1 #production
+    min_memory: 32M 
+    max_memory: 1G
+    path: /solr-4.10.2/default #production #ollection1 #production
 #    solr_home: solr
     # read_timeout: 2
     # open_timeout: 0.5
@@ -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