ignore sbin

.gitignore

@@ -28,27 +28,35 @@
 /db/schema.rb
 /db/structure.sql
 /config/initializers/devise.rb
-Gemfile.lock
+
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
 /config/initializers/devise.rb
 /app/doc/*
 /bin/*
-
+/sbin/*
 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
+*.pid
+
+/doc/app
+coverage/*

Gemfile

@@ -1,27 +1,30 @@
 source 'https://rubygems.org'
+gem 'rake', '~>12.3'
+#gem 'rails', '3.2.13'
+gem 'rails', '~>4.0'
 
-gem 'rails', '3.2.13'
+gem 'sprockets'#, '2.2.2'
-gem 'sprockets', '2.2.2'
+gem 'webrick'#, '1.3.1'
-gem 'webrick', '1.3.1'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
-  gem 'mysql2'
+  gem 'mysql2'#, '~>0.3.10'
-  gem 'sqlite3'
+  gem 'sqlite3', '~>1.3.0'
   gem 'execjs', '~>1.4.0' 
 
   gem 'sanitize',  :git=>'git://github.com/rgrove/sanitize'
 
 # Gems used only for assets and not required
 # in production environments by default.
-  gem 'sass-rails', '~> 3.2'
+  gem 'sass-rails', '~> 5.0'
-  gem 'coffee-rails', '~> 3.2.1'
+  gem 'coffee-rails', '~> 4.2.2'
-  gem 'bootstrap-sass','~> 2.3.2.1'
+  gem 'bootstrap'#,'~> 3.4'
   
-group :assets do
+#group :assets do
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', :platforms => :ruby
+#  gem 'therubyracer', :platforms => :ruby
-  gem 'uglifier', '>= 1.0.3'
+  gem 'mini_racer'
-end
+  gem 'uglifier'#, '>= 1.0.3'
+#end
 gem 'active_record_query_trace'
 
 gem 'jquery-rails'
@@ -33,8 +36,8 @@ gem 'jquery-rails'
 # gem 'jbuilder'
 
 # Use unicorn as the app server
- gem 'unicorn'
+# gem 'unicorn', '~>5.4' #4.8.0'
-
+gem 'puma'
 # Deploy with Capistran
 # gem 'capistrano'
 
@@ -43,7 +46,7 @@ gem 'jquery-rails'
 
 
 # Formbuilder for easier form generation
-gem 'formtastic', '~>2.2.1'
+gem 'formtastic', '~>3.1'
 
 # gem 'formtastic-bootstrap', '~>2.1.3' #, :git => "git://github.com/mjbellantoni/formtastic-bootstrap.git"
 gem 'formtastic-bootstrap', '~>3.0.0' #, :git => "git://github.com/mjbellantoni/formtastic-bootstrap.git"
@@ -52,28 +55,29 @@ gem "tinymce-rails" , '~>4.1.0'
 
 # Internationalisierung
 #gem "globalize3"  ,'~>3.0.4'
-gem "globalize" ,'~>3.0.4'#,:git =>'git://github.com/globalize/globalize.git'
+gem "globalize" ,'~>5.1'#,:git =>'git://github.com/globalize/globalize.git'
 gem 'globalize-versioning'
 gem 'globalize-accessors'
 # Version controll
-gem "paper_trail" , '~>3.0.5'#, :git=>'git://github.com/airblade/paper_trail.git'
+gem "paper_trail" # , '~>3.0.5i'#, :git=>'git://github.com/airblade/paper_trail.git'
 
 # User management
-gem "devise" ,'~>2.2.3'
+gem "devise" #,'~>2.2.3'
-gem "omniauth"
+gem "omniauth" , '~>1.6'
-gem "omniauth-facebook"
+gem "omniauth-facebook" #, '~>2.0.0'
-gem "omniauth-ldap"
+gem "omniauth-ldap" #, '~>1.0.4'
 
-gem "fb_graph"
+gem "fb_graph" #,'~>2.7.17'
 gem "meta-tags"
 # Roles for users
-gem "rolify"
+gem "rolify" # , '~>4.0.0'
 # Abilities
-gem "cancan"
+gem "cancan" #, '~>1.6.0'
+
 
 # Fileupload
 
-gem 'paperclip' ,'~>3.4.0'
+gem 'paperclip' #,'~>3.4.0'
 
 gem 'git'
 gem 'haml'
@@ -81,27 +85,38 @@ 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"
+gem 'carrierwave'#, "~>0.9.0"
 group :development, :test do 
-gem 'factory_girl_rails'
+gem 'factory_bot_rails'#,"~>4.5.0"
-gem 'rspec-rails'
+gem 'minitest'#, "~>4.7.5"
+gem 'progress_bar'
+gem 'rspec-core'#, '~>3.8.0'
+gem 'rspec-support'#, '~>3.3.0'
+gem 'rspec-rails'#, '~>3.3.0'
+gem 'rspec-collection_matchers'#, '~>1.1.2'
+gem 'rspec-activemodel-mocks'#, '~>1.0.1'
+gem 'rspec-html-matchers'#, '~>0.7.0'
+gem 'rspec-expectations'#, '~>3.3.1'
+gem 'capybara'#, '~>2.5.0'
+gem 'simplecov'
 end
 
-gem "simple_calendar", "~> 0.1.9"
+gem "simple_calendar"#, "~> 0.1.9"
 gem 'rmagick'
 
 gem 'bootstrap-addons-rails'
-gem "jquery-fileupload-rails", "0.4.1"
+gem "jquery-fileupload-rails"#, "0.4.1"
-gem "jquery-ui-rails","~> 4.1.1" 
+gem "jquery-ui-rails" #,"~> 4.1.0" 
 gem "font-awesome-rails"
 gem "jquery-datetimepicker-rails"
 # gem "jquery-sortable-rails"
-gem "seed_dump", "~> 0.5.3"
+gem "seed_dump"#, "~> 0.5.3"
 #gem "themes_for_rails" ,:git =>'git://github.com/tkriplean/themes_for_rails.git'
 #gem "themes_for_rails", :git=> 'git://github.com/lucasefe/themes_for_rails.git'
-gem 'themes_for_rails'
+#gem 'themes_for_rails'
 
+gem 'themes_on_rails'
 gem 'rubyzip'
 
 gem 'acts_as_votable'
@@ -125,3 +140,12 @@ gem 'blueimp-gallery'
 gem 'blueimp-gallery-rails'
 
 gem 'shareable'
+
+gem 'sunspot_test'
+
+
+
+# needed because of RAILS 4
+gem 'protected_attributes'
+
+gem 'actionpack-action_caching'

Gemfile.lock

@@ -0,0 +1,512 @@
+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: 424f02f4fd279e650117d32388d0840097dbc4c9
+  specs:
+    sanitize (5.0.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.11)
+      actionpack (= 4.2.11)
+      actionview (= 4.2.11)
+      activejob (= 4.2.11)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.11)
+      actionview (= 4.2.11)
+      activesupport (= 4.2.11)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionpack-action_caching (1.2.0)
+      actionpack (>= 4.0.0, < 6)
+    actionview (4.2.11)
+      activesupport (= 4.2.11)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    active_record_query_trace (1.5.4)
+    activejob (4.2.11)
+      activesupport (= 4.2.11)
+      globalid (>= 0.3.0)
+    activemodel (4.2.11)
+      activesupport (= 4.2.11)
+      builder (~> 3.1)
+    activerecord (4.2.11)
+      activemodel (= 4.2.11)
+      activesupport (= 4.2.11)
+      arel (~> 6.0)
+    activesupport (4.2.11)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    acts_as_votable (0.12.0)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    aes_key_wrap (1.0.1)
+    annotate (2.7.4)
+      activerecord (>= 3.2, < 6.0)
+      rake (>= 10.4, < 13.0)
+    arel (6.0.4)
+    attr_required (1.0.1)
+    autoprefixer-rails (9.5.0)
+      execjs
+    awesome_nested_set (3.1.4)
+      activerecord (>= 4.0.0, < 5.3)
+    bcrypt (3.1.12)
+    bindata (2.4.4)
+    blueimp-gallery (2.11.0.1)
+      railties (>= 3.1.0)
+    blueimp-gallery-rails (2.7.0)
+      railties (>= 3.0, < 5.0)
+    bootstrap (4.3.1)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.14.3, < 2)
+      sassc-rails (>= 2.0.0)
+    bootstrap-addons-rails (0.1.2)
+      rails
+    builder (3.2.3)
+    cancan (1.6.10)
+    capybara (3.13.2)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    carrierwave (1.3.1)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+    chronic (0.10.2)
+    climate_control (0.2.0)
+    coffee-rails (4.2.2)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
+    devise (4.6.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 6.0)
+      responders
+      warden (~> 1.2.3)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    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_bot (5.0.2)
+      activesupport (>= 4.2.0)
+    factory_bot_rails (5.0.1)
+      factory_bot (~> 5.0.0)
+      railties (>= 4.2.0)
+    faraday (0.15.4)
+      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.10.0)
+    font-awesome-rails (4.7.0.4)
+      railties (>= 3.2, < 6.0)
+    formtastic (3.1.5)
+      actionpack (>= 3.2.13)
+    formtastic-bootstrap (3.0.0)
+      formtastic (>= 2.2)
+    git (1.5.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    globalize (5.2.0)
+      activemodel (>= 4.2, < 5.3)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.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.6.0)
+    highline (2.0.1)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jquery-datetimepicker-rails (2.4.1.0)
+    jquery-fileupload-rails (1.0.0)
+      actionpack (>= 3.1)
+      railties (>= 3.1)
+      sassc
+    jquery-rails (4.3.3)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (6.0.1)
+      railties (>= 3.2.16)
+    json (2.1.0)
+    json-jwt (1.10.0)
+      activesupport (>= 4.2)
+      aes_key_wrap
+      bindata
+    jwt (2.1.0)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
+    libv8 (6.7.288.46.1)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    meta-tags (2.11.1)
+      actionpack (>= 3.2.0, < 6.1)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    mini_racer (0.2.4)
+      libv8 (>= 6.3)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    mysql2 (0.5.2)
+    net-ldap (0.16.1)
+    netrc (0.11.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    nokogumbo (2.0.1)
+      nokogiri (~> 1.8, >= 1.8.4)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.9.0)
+      hashie (>= 3.4.6, < 3.7.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-facebook (5.0.0)
+      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.6.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.9)
+    opengraph_parser (0.2.3)
+      addressable
+      nokogiri
+    options (2.3.2)
+    orm_adapter (0.5.0)
+    paper_trail (4.2.0)
+      activerecord (>= 3.0, < 6.0)
+      activesupport (>= 3.0, < 6.0)
+      request_store (~> 1.1)
+    paperclip (6.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
+      mime-types
+      mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
+    popper_js (1.14.5)
+    pr_geohash (1.0.0)
+    progress_bar (1.3.0)
+      highline (>= 1.6, < 3)
+      options (~> 2.3.0)
+    protected_attributes (1.1.4)
+      activemodel (>= 4.0.1, < 5.0)
+    public_suffix (3.0.3)
+    puma (3.12.0)
+    pyu-ruby-sasl (0.0.3.3)
+    rack (1.6.11)
+    rack-oauth2 (1.9.3)
+      activesupport
+      attr_required
+      httpclient
+      json-jwt (>= 1.9.0)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.11)
+      actionmailer (= 4.2.11)
+      actionpack (= 4.2.11)
+      actionview (= 4.2.11)
+      activejob (= 4.2.11)
+      activemodel (= 4.2.11)
+      activerecord (= 4.2.11)
+      activesupport (= 4.2.11)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.11)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (4.2.11)
+      actionpack (= 4.2.11)
+      activesupport (= 4.2.11)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    regexp_parser (1.3.0)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.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 (5.2.0)
+    rsolr (2.2.1)
+      builder (>= 2.1.2)
+      faraday (>= 0.9.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-activemodel-mocks (1.1.0)
+      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.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-html-matchers (0.9.1)
+      nokogiri (~> 1)
+      rspec (>= 3.0.0.a, < 4)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubyntlm (0.3.4)
+    rubyzip (1.2.2)
+    sass (3.7.3)
+      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 (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    sassc (2.0.1)
+      ffi (~> 1.9)
+      rake
+    sassc-rails (2.1.0)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    seed_dump (3.3.1)
+      activerecord (>= 4)
+      activesupport (>= 4)
+    shareable (1.1.4)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    simple_calendar (2.3.0)
+      rails (>= 3.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sitemap_generator (6.0.2)
+      builder (~> 3.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.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)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
+    themes_on_rails (0.4.0)
+      rails (>= 3.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tilt (2.0.9)
+    tinymce-rails (4.1.10)
+      railties (>= 3.1.1)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uglifier (4.1.20)
+      execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    warden (1.2.7)
+      rack (>= 1.0)
+    webrick (1.4.2)
+    whenever (0.10.0)
+      chronic (>= 0.6.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    yaml_db (0.7.0)
+      rails (>= 3.0)
+      rake (>= 0.8.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack-action_caching
+  active_record_query_trace
+  acts_as_votable
+  annotate
+  awesome_nested_set
+  blueimp-gallery
+  blueimp-gallery-rails
+  bootstrap
+  bootstrap-addons-rails
+  bootstrap-kaminari-views!
+  cancan
+  capybara
+  carrierwave
+  coffee-rails (~> 4.2.2)
+  devise
+  etherpad-lite
+  execjs (~> 1.4.0)
+  factory_bot_rails
+  fb_graph
+  font-awesome-rails
+  formtastic (~> 3.1)
+  formtastic-bootstrap (~> 3.0.0)
+  git
+  globalize (~> 5.1)
+  globalize-accessors
+  globalize-versioning
+  haml
+  jquery-datetimepicker-rails
+  jquery-fileupload-rails
+  jquery-rails
+  jquery-ui-rails
+  kaminari
+  meta-tags
+  mini_racer
+  minitest
+  mysql2
+  omniauth (~> 1.6)
+  omniauth-facebook
+  omniauth-ldap
+  opengraph_parser
+  paper_trail
+  paperclip
+  progress_bar
+  protected_attributes
+  puma
+  rails (~> 4.0)
+  rake (~> 12.3)
+  rmagick
+  rolify
+  rspec-activemodel-mocks
+  rspec-collection_matchers
+  rspec-core
+  rspec-expectations
+  rspec-html-matchers
+  rspec-rails
+  rspec-support
+  rubyzip
+  sanitize!
+  sass-rails (~> 5.0)
+  seed_dump
+  shareable
+  simple_calendar
+  simplecov
+  sitemap_generator
+  sprockets
+  sqlite3 (~> 1.3.0)
+  sunspot_rails
+  sunspot_solr
+  sunspot_test
+  themes_on_rails
+  tinymce-rails (~> 4.1.0)
+  uglifier
+  webrick
+  whenever
+  yaml_db
+
+BUNDLED WITH
+   1.16.6

README

@@ -0,0 +1,25 @@
+SETUP:
+
+install ruby 2.1.10
+
+install requirements
+apt-get ...
+
+
+mkdir /srv/fetsite
+cd /srv/fetsite
+
+copy / fetch Gemfile
+
+make User fetsite
+
+
+bundle install
+
+# Config Files kopieren:
+cp /srv/fetsite/config/omniout_secrets.yml.example /srv/fetsite/config/omniout_secrets.yml
+cp /srv/fetsite/config/omniout_secrets.yml.example /srv/fetsite/config/omniout_secrets.yml
+touch crawler_config.yml
+
+# Datenbank erstellen
+rake db:migrate

README_productive.md

@@ -0,0 +1,11 @@
+
+install ruby/fetsite requirements
+
+do all the rvm stuff
+
+apt-get install git
+
+chown fetsite /srv
+
+su fetsite
+cd /srv

app/assets/javascripts/application.js

@@ -12,7 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery.ui.all
+//= require jquery-ui/core
 // require jquery.ui.draggable
 // require jquery.ui.sortable
 // require jquery.ui.gallery

app/assets/stylesheets/application.bak.css.scss

@@ -14,9 +14,10 @@
  *= require blueimp-gallery-all
  *= require jquery.fileupload-ui
  *= require jquery.datetimepicker	
- *= require jquery.ui.dialog
+ *= require jquery-ui/dialog
- *= require jquery.ui.autocomplete
+ *= require jquery-ui/autocomplete
- *= require jquery.ui.tabs
+ *= require jquery-ui/progressbar
+ *= require jquery-ui/tabs
  * require 'bootstrap'
  * require 'neuigkeiten'
  */
@@ -72,7 +73,7 @@ $infoText:#03406A;
 $sansFontFamily: Helvetica, Arial;
 
 @import 'bootstrap';
-@import 'bootstrap-responsive';
+//@import 'bootstrap-responsive';
 @import 'bootstrap/image-gallery';
 @import 'font-awesome';
 @import 'neuigkeiten';
@@ -117,5 +118,6 @@ $box-border-radius:0px;
 $box-background: white;
 
 @import 'layout';
+@import 'linkboxes';
 @import 'calendars';
 @import 'formtastic-bootstrap'

app/assets/stylesheets/application.css.scss

@@ -1,149 +0,0 @@
-
-/*
-* This is a manifest file that'll be compiled into application.css, which will include all the files
-* listed below.
-*
-* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
-* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
-*
-* You're free to add application-wide styles to this file and they'll appear at the top of the
-* compiled file, but it's generally better to create a new file per style scope.
-*= require_self	
-* require_tree .
-*= require 'calendars'
-*= require jquery.fileupload-ui
-* require 'bootstrap'
-*= require 'tinymce'
-
-*/
-// Colorshema #0A64A4
-$color_prim: #0A64A4;
-$color_prim_light: #0B65A5;
-$color_prim_vlight: #2B85C5;
-$color_cont: FFDB73;
-$color_cont_light:FFDB73;
-$linkColor: #03006E;
-$white: #FFFFFF;
-
-$bodyBackground: $white;
-$navbarBackground: $color_cont;
-$navbarBackground: #FFFFFF;
-
-$navbarBackgroundHighlight:lighten($navbarBackground,30%);
-//$navbarBackgroundHighlight:#FFFFFF;
-
-$navbarLinkBackgroundHover:#FFBE00;
-$navbarLinkBackgroundHover: lighten(#cccccc,10%);
-$infoBackground:#65A5D1;
-$infoText:#03406A;
-$sansFontFamily: Helvetica, Arial;
-@import 'bootstrap';
-@import 'bootstrap-responsive';
-@import 'bootstrap/image-gallery';
-
-@import 'font-awesome';
-
-h1 {
-font-size: 23px
-}
-
-h2 { 
-font-size: 19px
-}
-
-body,html { 
-padding:0;
-margin:0;
-
-}
-a:hover {
-text-decoration:none;
-}
-
-div.header { 
-display: block; 
-// background: url('/header1.png') no-repeat;
-background-color: #FFF;
-background-position: right; 
-border-bottom:1px solid black; 
-height:41px; 
-color:#000;
-padding-left:87px;
-padding-top:0px;
-overflow:hidden;
-margin-bottom: 20px
-}
-div.header h1 {
-padding:0;
-margin:4px;
-font-size:20px;
-line-height:32px;
-}
-#menudiv { 
-width:100%;
-}
-
-
-.navbar .nav li {
-min-width:100%;
-}
-.navbar .nav .divider {
-border-style: solid;  
-border-width: 1px 0px 0px 0px;
-border-color: grey;
-min-width: 100%;
-}
-
-.navbar .navbar-inner 
-{
-border:none;
-box-shadow:none;
-}
-#contentdiv
-{
-background: #FFFFFF
-}
-#contentdiv .container-fluid
-{ 
-padding:0;
-}
-
-a.linkbox, div.contentbox
-{
-display:block;
-padding:5px;
-border-radius: 10px;
-border: lightgray solid 1px;
-
-}
-
-a.linkbox:hover
-{
-box-shadow: 1px 1px 2px 2px lightgray;
-}
-
-a.linkbox li
-{ 
-}
-ul.linkbox-list li
-{
-margin-bottom:10px;
-}
-ul.linkbox-list
-{ 
-max-width:70em;
-}
-
-div.contentbox
-{
-margin: 5px;
-}
-
-
-.navbar .nav li {
-min-width:100%;
-background:44F;
-}
-
-@import 'galleries';
-@import 'tinymce';

app/assets/stylesheets/infoscreenframe.css

@@ -0,0 +1,134 @@
+html {
+    background-color: #fff;
+    overflow: hidden;
+}
+
+body {
+    display: flex;
+    flex-flow: wrap;
+    height: 100vh;
+    justify-content: space-between;
+    flex-direction: column;
+}
+
+.header {
+    height: 200px;
+    width: 100%
+}
+
+svg {
+    padding-top: 2em;
+}
+
+.impulsPath {
+    fill: none;
+    stroke: #04669c;
+    stroke-miterlimit: 1;
+    stroke-width: 6px;
+    stroke-dasharray: 1946.243;
+    stroke-dashoffset: 0;
+    stroke-linejoin: round;
+    stroke-linecap: round;
+    animation: dash 10s ease-out infinite;
+    animation-direction: normal;
+}
+
+.FET-logotext-stroke {
+    fill: #fff;
+}
+
+#FET-logotext {
+    opacity: 0;
+    animation: logotext 10s ease-in infinite;
+
+}
+
+
+.content-area {
+
+    height: auto;
+    width: 100%;
+}
+
+.footer {
+    width: 100%;
+    height: 150px;
+    background-color: #04669c;
+    padding-bottom: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    color: #fff;
+    flex-basis: bottom;
+}
+
+.footer h3,
+p {
+    margin: 0;
+    padding: 0 20px;
+    font-family: Helvetica, Arial;
+    letter-spacing: 0.1em;
+}
+
+.footer h3 {
+    padding-top: 20px;
+}
+
+.footer .adress {
+    margin: auto;
+    text-align: left;
+}
+
+.footer .contact {
+    margin: auto;
+    text-align: center;
+}
+
+.footer .servicecontainer{
+    display: inline-flex;
+    margin: auto;
+    
+}
+.footer .servicecontainer .servicetime {
+    margin: auto;
+    text-align: right;
+}
+
+.footer .servicecontainer .servicetime #time {
+    font-size: 0.7em
+}
+
+.footer .servicecontainer .servicestatus{
+    margin: auto;
+    width:20px;
+    height: 100vh; /* height: 100%;*/
+    padding-right: 30px;
+    background-color: #fff;
+}
+
+
+
+
+/*K E Y F R A M E S*/
+
+@keyframes dash {
+    from {
+        stroke-dashoffset: 1946.243;
+        opacity: 0;
+        stroke-width: 0.5;
+    }
+    to {
+        opacity: 1;
+        stroke-dashoffset: 0;
+        stroke-width: 5px;
+    }
+}
+
+@keyframes logotext {
+    from {
+        opacity: 0;
+    }
+    to {
+        opacity: 1;
+    }
+}

app/assets/stylesheets/layout.css.scss

@@ -44,98 +44,6 @@ a:hover {
 
 
 
-ul.linkbox-list
-{ 
-  max-width:70em;
-margin-left:auto;
-margin-right:auto;
-}
-a.linkbox, div.contentbox
-{
-	display:block;
-	padding:5px;
-	border-radius:$box-border-radius;
-	border: $box-border;
-	background: $box-background;	
-}
-
-
-a.linkbox:hover
-{
-box-shadow: 1px 1px 2px 2px lightgray;
-}
-
-a.linkbox.color-1
-{
-color:$color_schema_1;	
-}
-a.linkbox.color-2
-{
-color:$color_schema_2;	
-}
-a.linkbox.color-3
-{
-color:$color_schema_3;	
-}
-a.linkbox.color-4
-{
-color:$color_schema_4;	
-}
-a.linkbox.color-5
-{
-color:$color_schema_5;	
-}
-
-a.color-1-dark
-{
-color:$color_schema_1_dark;	
-}
-a.color-2-dark
-{
-color:$color_schema_2_dark;	
-}
-a.color-3-dark
-{
-color:$color_schema_3_dark;	
-}
-a.color-4-dark
-{
-color:$color_schema_4_dark;	
-}
-a.color-5-dark
-{
-color:$color_schema_5_dark;	
-}
-a.color-1-dark:hover
-{
-color:$color_schema_1;	
-}
-a.color-2-dark:hover
-{
-color:$color_schema_2;	
-}
-a.color-3-dark:hover
-{
-color:$color_schema_3;	
-}
-a.color-4-dark:hover
-{
-color:$color_schema_4;	
-}
-a.color-5-dark:hover
-{
-color:$color_schema_5;	
-}
-
-
-a.linkbox li
-{ 
-}
-ul.linkbox-list li
-{
-margin-bottom:10px;
-}
-
 div.contentbox
 {
 	margin: 5px;
@@ -175,28 +83,6 @@ div.smallspan {
   min-height:0;
 }
 
-ul.linklist
-{max-width:100%;
-padding:0;
-margin:5px;
-}
-ul.linklist li{
-list-style:none;
-margin-bottom:2px;
-}
-ul.linklist li a i{
-vertical-align:middle;
-margin-right:6px;
-font-size:2em;}
-span.linklist a {
-	padding:5px;
-	border-radius:$box-border-radius;
-	border: $box-border;
-	background: $box-background;
-	display:block;
-	float:left;	
-
-}
 
 form.inline div {
 float:left;}

app/assets/stylesheets/linkboxes.css.scss

@@ -0,0 +1,61 @@
+ul.linkbox-list
+{ 
+  max-width:70em;
+	margin-left:auto;
+	margin-right:auto;
+}
+a.linkbox, div.contentbox
+{
+	display:block;
+	padding:5px;
+	border-radius:$box-border-radius;
+	border: $box-border;
+	background: $box-background;	
+}
+
+a.linkbox:hover{ box-shadow: 1px 1px 2px 2px lightgray; }
+
+a.linkbox.color-1 { color:$color_schema_1; }
+a.linkbox.color-2 { color:$color_schema_2; }
+a.linkbox.color-3 { color:$color_schema_3; }
+a.linkbox.color-4 { color:$color_schema_4;}
+a.linkbox.color-5 { color:$color_schema_5;}
+
+a.color-1-dark { color:$color_schema_1_dark;	}
+a.color-2-dark { color:$color_schema_2_dark;	}
+a.color-3-dark { color:$color_schema_3_dark;}
+a.color-4-dark { color:$color_schema_4_dark;}
+a.color-5-dark { color:$color_schema_5_dark;}
+a.color-1-dark:hover { color:$color_schema_1;	}
+a.color-2-dark:hover { color:$color_schema_2;	}
+a.color-3-dark:hover { color:$color_schema_3;	}
+a.color-4-dark:hover { color:$color_schema_4;	}
+a.color-5-dark:hover { color:$color_schema_5;	}
+
+a.linkbox li { }
+ul.linkbox-list li {
+		margin-bottom:10px;
+}
+ul.linklist {
+		max-width:100%;
+		padding:0;
+		margin:5px;
+}
+ul.linklist li {
+		list-style:none;
+		margin-bottom:2px;
+}
+ul.linklist li a i{
+		vertical-align:middle;
+		margin-right:6px;
+		font-size:2em;}
+span.linklist a {
+		padding:5px;
+		border-radius:$box-border-radius;
+		border: $box-border;
+		background: $box-background;
+		display:block;
+		float:left;	
+
+}
+

app/assets/stylesheets/themes/2003/application.css.scss

@@ -1,106 +0,0 @@
-
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- * require_tree .
- *= require jquery.fileupload-ui
- * require 'bootstrap'
-
- * require 'neuigkeiten'
- */
-// Colorshema #0A64A4
-$color_schema_1: #006599;
-$color_schema_2: #630CE8;
-$color_schema_3: #FF0021;
-$color_schema_4: #E8820C;
-$color_schema_5: #FFF30D;
-
-$color_schema_1_dark: darken($color_schema_1, 10%);
-$color_schema_2_dark: darken($color_schema_2, 10%);
-$color_schema_3_dark: darken($color_schema_3, 10%);
-$color_schema_4_dark: darken($color_schema_4, 10%);
-$color_schema_5_dark: darken($color_schema_5, 10%);
-
-
-$color_prim: #7070a0;
-$color_prim_light: lighten($color_prim ,10%);
-$color_prim_vlight: lighten($color_prim ,30%);
-$color_prim_dark: darken($color_prim ,10%);
-$color_prim_vdark: darken($color_prim ,30%);
-
-$color_cont: FFDB73;
-$color_cont_light:FFDB73;
-$linkColor: $color_prim_vdark;
-$white: #FFFFFF;
-
-$bodyBackground: #EEE;
-
-
-
-
-$navbarBackground: $color_prim;
-$navbarText: black; 
-$navbarLinkColor: $color_prim_vdark;
-$navbarLinkColorHover: black;
-$dropdownLinkColor: black;
-$navbar-default-brand-color: black;
-$navbarBrandColor:black;
-
-
-$navbarBackgroundHighlight: $color_prim;
-//$navbarBackgroundHighlight:#FFFFFF;
-
-$navbarLinkBackgroundHover:#FFBE00;
-$navbarLinkBackgroundHover: darken($navbarBackground,10%);
-
-
-$infoBackground:#65A5D1;
-$infoText:#03406A;
-$sansFontFamily: Helvetica, Arial;
-
-@import 'bootstrap';
-@import 'bootstrap-responsive';
-@import 'bootstrap/image-gallery';
-
-@import 'neuigkeiten';
-@import 'font-awesome';
-
-div.header { 
-  display: block; 
-//  background: url('../../../../header1.png') no-repeat;
-//  background-color:white;// $color_prim;
-  background-position: right; 
-  border-bottom:1px solid black; 
-  float:left;
-  color:#000;
-  padding-left:87px;
-  padding-top:0px;
-//  overflow:hidden;
-  margin-bottom: 0 px
-}
-div.header h1 {
-	   padding:0;
-margin:4px;
-font-size:20px;
-line-height:32px;
-}
-
-div.headerrow {
-background: $color_prim
-}
-	$contentdiv-background:none;
-$navbar-li-minwidth: 0;
-
-$box-border: lightgray solid 1px;
-$box-border-radius:8px;
-$box-background: white;
-@import 'layout';
-@import 'calendars';

app/assets/stylesheets/themes/2003/bootstrap-responsive.scss

@@ -1,5 +0,0 @@
-@import "bootstrap/responsive";
-@media (max-width: 979px){
-.earlymax {
-min-width: 100%;
-}}

app/assets/stylesheets/themes/2003/test.css.scss

@@ -1,4 +0,0 @@
-#content
-{
-	background:red;
-}

app/assets/stylesheets/themes/darkblue/application.css.scss

@@ -1,126 +0,0 @@
-
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- * require_tree .
- *= require jquery.fileupload-ui
- * require 'bootstrap'
-
- * require 'neuigkeiten'
- */
-$color_schema_1: #006599;
-$color_schema_2: #630CE8;
-$color_schema_3: #FF0021;
-$color_schema_4: #E8820C;
-$color_schema_5: #FFF30D;
-
-$color_schema_1_dark: darken($color_schema_1, 10%);
-$color_schema_2_dark: darken($color_schema_2, 10%);
-$color_schema_3_dark: darken($color_schema_3, 10%);
-$color_schema_4_dark: darken($color_schema_4, 10%);
-$color_schema_5_dark: darken($color_schema_5, 10%);
-
-// Colorshema #0A64A4
-$color_prim: #071672;
-$color_prim_light: lighten($color_prim ,10%);
-$color_prim_vlight: lighten($color_prim ,30%);
-$color_prim_dark: darken($color_prim ,10%);
-$color_prim_vdark: darken($color_prim ,30%);
-
-$color_cont: FFDB73;
-$color_cont_light:FFDB73;
-$linkColor: $color_prim;
-$white: #FFFFFF;
-
-$bodyBackground: #EEE;
-
-
-
-
-$navbarBackground: $color_prim;
-$navbarText: $white; 
-$navbarLinkColor: $white;
-$navbarLinkColorHover: white;
-$dropdownLinkColor: black;
-$navbar-default-brand-color: black;
-$navbarBrandColor:black;
-
-
-$navbarBackgroundHighlight: $color_prim;
-//$navbarBackgroundHighlight:#FFFFFF;
-
-$navbarLinkBackgroundHover:#FFBE00;
-$navbarLinkBackgroundHover: darken($navbarBackground,10%);
-
-
-$infoBackground:#65A5D1;
-$infoText:#03406A;
-
-@font-face {
-font-family: 'ayuma2yk';
-src:font-url('Ayuma2yk.ttf');}
-@font-face {
-  font-family: 'cmunrm';
-  src: font-url('cmunrm.eot');
-  src: font-url('cmunrm.eot') format('embedded-opentype'),
-       font-url('cmunrm.woff') format('woff'),
-       font-url('cmunrm.ttf') format('truetype'),
-       font-url('cmunrm.svg') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-
-
-
-$sansFontFamily: cmunrm, Helvetica, Arial;
-
-@import 'bootstrap';
-@import 'bootstrap-responsive';
-@import 'bootstrap/image-gallery';
-@import 'font-awesome';
-@import 'neuigkeiten';
-@import 'fetlogo';
-#menudiv {
-
-}
-
-div.header { 
-  display: block; 
-//  background: url('../../../../header1.png') no-repeat;
-//  background-color:white;// $color_prim;
-  background-position: right; 
-  font-family: ayuma2yk;
- // border-bottom:1px solid black; 
-  float:left;
-  color:#000;
-  padding-left:87px;
-  padding-top:0px;
-//  overflow:hidden;
-  margin-bottom: 0 px
-}
-div.header h1 {
-	   padding:0;
-margin:4px;
-font-size:20px;
-line-height:32px;
-}
-
-div.headerrow {
-background: $color_prim
-}
-	$contentdiv-background:none;
-$navbar-li-minwidth: 0;
-
-$box-border: lightgray solid 1px;
-$box-border-radius:0px;
-$box-background: white;
-@import 'layout';
-@import 'calendars';

app/assets/stylesheets/themes/white_1/application.css.scss

@@ -1,91 +0,0 @@
-
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- * require_tree .
- *= require jquery.fileupload-ui
- * require 'bootstrap'
-
- * require 'neuigkeiten'
- */
-
-
-$color_schema_1: #006599;
-$color_schema_2: #630CE8;
-$color_schema_3: #FF0021;
-$color_schema_4: #E8820C;
-$color_schema_5: #FFF30D;
-
-$color_schema_1_dark: darken($color_schema_1, 30%);
-$color_schema_2_dark: darken($color_schema_2, 30%);
-$color_schema_3_dark: darken($color_schema_3, 30%);
-$color_schema_4_dark: darken($color_schema_4, 30%);
-$color_schema_5_dark: darken($color_schema_5, 30%);
-
-
-$color_prim: #0A64A4;
-$color_prim_light: #0B65A5;
-$color_prim_vlight: #2B85C5;
-$color_cont: FFDB73;
-$color_cont_light:FFDB73;
-$linkColor: #03006E;
-$white: #FFFFFF;
-
-$bodyBackground: $white;
-$navbarBackground: $color_cont;
-$navbarBackground: #FFFFFF;
-
-$navbarBackgroundHighlight:lighten($navbarBackground,30%);
-//$navbarBackgroundHighlight:#FFFFFF;
-
-$navbarLinkBackgroundHover:#FFBE00;
-$navbarLinkBackgroundHover: lighten(#cccccc,10%);
-$infoBackground:#65A5D1;
-$infoText:#03406A;
-$sansFontFamily: Helvetica, Arial;
-
-@import 'bootstrap';
-@import 'bootstrap-responsive';
-@import 'bootstrap/image-gallery';
-@import 'font-awesome';
-@import 'neuigkeiten';
-
-div.header { 
-  display: block; 
- // background: url('/header1.png') no-repeat;
-  background-color: #FFF;
-  background-position: right; 
-  border-bottom:1px solid black; 
-  height:41px; 
-  color:#000;
-  padding-left:87px;
-  padding-top:0px;
-  overflow:hidden;
-  margin-bottom: 20px
-}
-div.header h1 {
-padding:0;
-margin:4px;
-font-size:20px;
-line-height:32px;
-}
-div.headerrow {
-background: $white
-}
-$navbar-li-minwidth: 100%;
-	
-$contentdiv-background:none;
-$box-border: lightgray solid 1px;
-$box-border-radius:8px;
-$box-background: white;
-@import 'layout';
-@import 'calendars';
-@import 'tinymce';

app/controllers/application_controller.rb

@@ -9,15 +9,19 @@
     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
-    I18n.locale = session[:locale] ||  request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^de|en/).first || I18n.default_locale
+    http_header=request.env['HTTP_ACCEPT_LANGUAGE']
-    
+    unless http_header.nil?
+     ht= http_header.scan(/^de|en/).first
+    else
+      ht=nil
+    end
+    I18n.locale = session[:locale]  || I18n.default_locale
+    # removed ht from selection add || ht to check http header
 
     session[:locale] = I18n.locale
   end
@@ -46,7 +50,8 @@
     else              
       flash[:error] = "You must first login to view this page"
       session[:user_return_to] = request.url
-      redirect_to "/users/sign_in"
+      return redirect_to "/users/sign_in"
+      
     end 
     
   end 
@@ -55,7 +60,7 @@ u=current_user
  if ! u.try(:preferredtheme).nil? and ThemesForRails.available_theme_names.include?(u.preferredtheme) 
       u.preferredtheme
   else
-    "blue1"
+    "blue2"
   end
 
   end

app/controllers/beispiele_controller.rb

@@ -32,6 +32,7 @@ class BeispieleController < ApplicationController
   def new
     @beispiel = Beispiel.new
     @beispiel.lva = Lva.find_by_id(params[:lva_id])
+    @beispiel.flag_delete=false
     @backlink = @beispiel.lva.nil? ? root_url : lva_path(@beispiel.lva)
     respond_to do |format|
       format.html # new.html.erb
@@ -43,6 +44,7 @@ class BeispieleController < ApplicationController
     @beispiel = Beispiel.find(params[:id])
     @beispiel.lecturer = Lecturer.find(params[:beispiel][:lecturer_id])
     @beispiel.save
+    
     if @beispiel.save
       format.html { redirect_to @backlink, notice: 'Beispiel was successfully updated.' }
       format.js   {render text: "alert(\"updated\");"}
@@ -66,8 +68,9 @@ class BeispieleController < ApplicationController
     logger.info "Creating Beispiel..."
     @lva = Lva.find_by_id(params[:lva_id])
     params.delete(:lva_id)
+    params[:beispiel][:flag_delete]=false
     @beispiel = Beispiel.new(params[:beispiel])
-
+    @beispiel.flag_delete=false
     logger.info "New Beispiel: #{params.inspect}"
     
     @beispiel.name=@beispiel.beispieldatei.filename

app/controllers/documents_controller.rb

@@ -157,7 +157,7 @@ class DocumentsController < ApplicationController
       @results = Document.search do
         fulltext params['query'] do
           fields :name, :text, :meeting
-          highlight :text
+          highlight :text,:name,:meeting
         end
       end
       @res=[]

app/controllers/emails_controller.rb

@@ -0,0 +1,22 @@
+class EmailsController < ApplicationController
+before_filter :authorize
+
+  def index
+    
+  end
+  def daily_reminder
+    ActionMailer::Base.default_url_options[:host] = request.host_with_port 
+    @mail =NewsMailer.daily_reminder(current_user.id)
+    if params[:send]
+      usr=User.where(:flag_getemails => true)
+      usr.each do |u|
+        NewsMailer.daily_reminder(current_user.id).deliver
+      end
+    end
+    render layout: false
+end
+  protected
+  def authorize
+    authorize! :emails, User
+  end
+end

app/controllers/fetprofiles_controller.rb

@@ -9,18 +9,17 @@ class FetprofilesController < ApplicationController
     @fetprofiles = Fetprofile.order(:vorname,:nachname) if params[:filter]== "all"
     @fetprofiles = Fetprofile.where(:active=>false).order(:nachname,:vorname) if params[:filter]== "notactive"
 
-
     @gremientabs = Gremium.tabs
-     @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('profile.new_profile'),:path => new_fetprofile_path(@fetprofile) } if can? :new, @fetprofile
+    @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('profile.new_profile'),:path => new_fetprofile_path(@fetprofile) } if can? :new, @fetprofile
 
     respond_to do |format|
       format.html # index.html.erb
-      end
+    end
   end
 
   def internlist
     @fetprofiles = Fetprofile.order(:vorname,:nachname) 
-    end
+  end
 
   # GET /fetprofiles/1
   # GET /fetprofiles/1.json

app/controllers/home_controller.rb

@@ -19,6 +19,11 @@ class HomeController < ApplicationController
   end
   def dev
 
+  end
+  def infoscreen
+    authorize! :infoscreen, 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")

app/controllers/neuigkeiten_controller.rb

@@ -3,6 +3,7 @@ class NeuigkeitenController < ApplicationController
   
   before_filter :load_toolbar_elements, :only=>[:show,:find_link]
   before_filter :load_toolbar_elements_edit, :only=>[:edit]
+  acts_as_flagable
  
 
 
@@ -49,7 +50,7 @@ class NeuigkeitenController < ApplicationController
     end
     @calentry=ce 
     ce.object=@neuigkeit
-    @neuigkeit.calentry=ce
+    @neuigkeit.calentries<<ce
     @neuigkeit.save
     
     render 'edit'
@@ -119,12 +120,15 @@ end
     end  
   end
   def mail_preview
+  ActionMailer::Base.default_url_options[:host] = request.host_with_port 
+
     @neuigkeit = Neuigkeit.find(params[:id])
-   @user=current_user
+    @user=current_user
     @ability=Ability.new(@user)
+    @mail = NewsMailer.neuigkeit_mail("all@fet.at", params[:id])
 
     authorize! :publish, @neuigkeit
-    render template: "news_mailer/neuigkeit_mail", layout: false
+    render  layout: false
   end
   def newsletter_preview
     authorize! :publish, Neuigkeit
@@ -141,9 +145,10 @@ end
     @calentries<<  Calentry.new 
 
   end
+
   def find_link
     @rubrik=@neuigkeit.rubrik    
-   if can?(:shownonpublic, Rubrik)
+    if can?(:shownonpublic, Rubrik)
       @rubriken = Rubrik.all
     else
       @rubriken = Rubrik.where(:public=>true)
@@ -152,7 +157,8 @@ end
     @calentries1=@neuigkeit.calentries
     nlink_search = Neuigkeit::LINKTYPES.clone
     nlink_search.collect!{|t| t.constantize}
-   # @nlink_search.collect!{|t| t.search(params[:query]).limit(2)}
+
+    # @nlink_search.collect!{|t| t.search(params[:query]).limit(2)}
     @results= Sunspot.search nlink_search do 
       fulltext params[:query]
     end
@@ -164,6 +170,7 @@ end
   
  
   end
+
   def create_link
     @neuigkeit = Neuigkeit.find(params[:id])
 
@@ -174,6 +181,7 @@ end
       format.js
     end
   end
+
   def delete_link
     @neuigkeit = Neuigkeit.find(params[:id])
     @nlink = @neuigkeit.nlinks.find(params[:nlink_id])
@@ -183,6 +191,7 @@ end
       format.js
     end
   end  
+
   def create
     @neuigkeit = Neuigkeit.new(params[:neuigkeit])
     @neuigkeit.author=current_user

app/controllers/rubriken_controller.rb

@@ -16,7 +16,7 @@ class RubrikenController < ApplicationController
     @rubriken= Rubrik.accessible_by(current_ability, :show)
     @neuigkeiten = Neuigkeit.accessible_by(current_ability, :list).page(params[:page]).per(3)
     
-    @calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten.select {|c| c.object !=nil}
+    @calentries= (@rubriken.map {|r| r.calendar.calentries.of_month(Date.new(params[:year].to_i,params[:month].to_i,1))}).flatten.select {|c| c.object !=nil}
     respond_to do |format|
       format.html
       format.js {render action: :show}

app/controllers/themengruppen_controller.rb

@@ -3,7 +3,7 @@ class ThemengruppenController < ApplicationController
   # GET /themengruppen.json
   load_and_authorize_resource
   def index
-    @themengruppen = Themengruppe.accessible_by(current_ability, :show).public.includes(:themen)
+    @themengruppen = Themengruppe.accessible_by(current_ability, :show).not_intern.includes(:themen)
     @toolbar_elements = []
     @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()} if can? :new, Themengruppe
     @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.manage_all'), :path=>verwalten_all_themengruppen_path()} if can? :verwalten_all, Themengruppe

app/controllers/users/omniauth_callbacks_controller.rb

@@ -2,11 +2,23 @@
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   skip_before_filter :verify_authenticity_token
   def failure
-    
     # flash[:notice] = "Failure #{Hash.new(request.env)} #{Hash.new(params)}"
     #redirect_to new_user_registration_url , :notice=>"Omniauth Login failed" 
     super
   end  
+  def developer
+    if Rails.env.development?
+      @user= User.find_for_developer_oauth(request.env["omniauth.auth"],current_user)
+      if @user
+        sign_in_and_redirect @user, event: :authentication
+      else
+        redirect_to new_user_registration_url
+      end
+    else
+      flash[:notice]=flash[:notice] + "Still not logged in "
+      redirect_to new_user_registration_url
+    end
+  end
   def facebook
     # You need to implement the method below in your model (e.g. app/models/user.rb)
     @user = User.find_for_facebook_oauth(request.env["omniauth.auth"], current_user)
@@ -23,7 +35,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 
   def ldap
-logger.debug current_user.to_s
+    logger.debug current_user.to_s
     @user=User.find_for_ldap_oauth(request.env["omniauth.auth"],current_user) 
  #  @user=User.find_for_ldap_oauth(session["devise.ldap_data"],current_user)
    # @user=User.first

app/controllers/users_controller.rb

@@ -1,8 +1,22 @@
 class UsersController < ApplicationController
   def index 
+    authorize!(:index,User)
     @users = User.all
   end
+  def show
+    @user=User.find(params[:id])
+    authorize!(:show, @user)    
+
+  end
+  def set_preferred_theme
+    @user=User.find(params[:id])
+    authorize!(:set_preferred_theme, @user)    
+    @user.preferredtheme=params[:theme]
+    @user.save
+    redirect_to root_url
+  end
   def add_role
+    authorize!(:add_role, User)
     @user= User.find(params[:id])
     if (params[:role]=="fetuser" && can?(:addfetuser,User))
       @user.add_role(params[:role])
@@ -13,6 +27,8 @@ class UsersController < ApplicationController
     redirect_to users_url
   end
   def fb_set_default_publish_page
+    authorize!(:doadmin, User)
+
     if Fetsite::Application.config.facebookconfig_enabled
       if params["page"].nil? || !(current_user.provider=="facebook")
         redirect_to intern_home_index_path
@@ -27,6 +43,7 @@ class UsersController < ApplicationController
   end
   
   def all_update
+    authorize! :doadmin,User
     params[:users].each do |id,u| 
       user=User.find(id) 
       user.fetprofile = Fetprofile.find(u[:fetprofile_id].to_i) if u[:fetprofile_id].to_i>0 

app/helpers/application_helper.rb

@@ -42,8 +42,9 @@ m.save
 #    current_url1({:locale=>target_locale}) .sub "/"+I18n.locale.to_s+"/", "/"+target_locale.to_s+"/"
     language_path(locale: target_locale)
   end
+  
   def ffi1_icon (name)
-    content_tag("i","", class: "ficon ffi1-"+name )
+    content_tag("i", "", class: "ficon ffi1-" + name )
   end
 
   def ffi2_icon (name)
@@ -54,8 +55,11 @@ m.save
   end
 
   def fa_stack(icon1, icon2)
-   content_tag("span",  content_tag("span", content_tag("i","", class: "ficon "+" fa-"+icon1+" fa fa-stack-1x" ) +    content_tag("i","", class: "ficon "+" fa-"+icon2+" fa fa-stack-2x" ),class: "fa-stack "),class:"fa-stack-sm")
+    h_1 = content_tag("span", content_tag("i","", class: "ficon "+" fa-"+icon1+" fa fa-stack-1x" ) + content_tag("i","", class: "ficon "+" fa-"+icon2+" fa fa-stack-2x" ),class: "fa-stack ")
     
+    h_2 = content_tag("span", h_1 ,class: "fa-stack-sm")
+   
+    h_2
   end
   def ffi1_list 
     y=YAML.load_file("#{::Rails.root.to_s}/config/flatfeticon1.yml")

app/inputs/checkbox_autocomplete_input.rb

@@ -1,4 +1,4 @@
-class CheckboxAutocompleteInput < FormtasticBootstrap::Inputs::CheckboxInput
+class CheckboxAutocompleteInput < FormtasticBootstrap::Inputs::CheckBoxesInput
 	def input_html_options
 		super
 		#super.merge(:class => "input-append date")

app/mailers/news_mailer.rb

@@ -1,23 +1,44 @@
+# -*- coding: utf-8 -*-
+
 class NewsMailer < ActionMailer::Base
   default from: "salzamt@fet.at"
   helper :plugins
-  def current_user
+
-    @user
-  end
   def neuigkeit_mail(email, neuigkeit_id)
     @neuigkeit= Neuigkeit.find(neuigkeit_id)
     @user=User.first
     @ability=Ability.new(@user)
     subject =  @neuigkeit.title
-    subject = subject + " email: " + email if Rails.env=="development"
+    subject = subject.to_s + " email: " + email.to_s if Rails.env=="development"
     email = "andis@fet.at" if Rails.env=="development"
     email="andis@fet.at"
     mail(to: email, subject: subject)
-render locals: {current_user: User.first}
+    render locals: {current_user: User.first}
   end
   def daily_newsletter(user_id)
     user=User.find(user_id)
+    self.message.perform_deliveries = false unless user.flag_getemails
     ability= Ability.new(user)
+    
     @neuigkeiten=Neuigkeit.accessible_by(ability).published_scope.where("cache_order<2")
   end
+
+  def daily_reminder(user_id)
+    user=User.find(user_id)
+    @user=user
+    self.message.perform_deliveries = false unless user.flag_getemails
+    @ability = Ability.new(user)
+    @calentries = Calentry.of_month(Date.today).limit(100)
+#    @neuigkeiten=Neuigkeit.accessiblße_by(ability).published_scope.where("cache_order<2")
+    mail(to: user.email,      content_type: "text/html", subject: "sdf")
+    render locals: {c_user: user}
+ end
+private
+include CanCan::ControllerAdditions
+  def current_user
+    @user
+  end
+  def current_ability
+    @ability
+  end 
 end

app/models/ability.rb

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
+require 'ipaddr'
 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")
     loggedin=!(user.nil?)
     unless key.nil?
       k=Key.find_by_uuid(key)
@@ -10,6 +13,9 @@ class Ability
       end
     end
     user ||=  User.new # guest user (not logged in)
+    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"))
       can [:show,:answer, :create,:new, :create_from_template, :flag], Survey::Question
@@ -152,6 +158,7 @@ end
     can :show, Neuigkeit, :cache_is_published=>true, :rubrik=>{:public=>true}
 
     if loggedin
+      can :show, :id => user.id
     end
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
 
@@ -159,6 +166,7 @@ end
       can :showintern, Neuigkeit
       can :showintern, Rubrik
       can :seeintern, User
+      can :set_preferred_theme, user
       can :list, Neuigkeit
       can :shownonpublic, Rubrik
       can :manage, Nlink
@@ -169,8 +177,12 @@ end
     if user.has_role?("fetadmin")
       can :addfetuser, User
       can :addfetadmin, User
+      can :add_role, User
+      can :show, User
+      can :index, User
       can :edit, User
       can :manage, User
+      can :set_preferred_theme, User
     end
     
     if user.has_role?("newsadmin") || user.has_role?( "fetadmin") || user.has_role?( "fetuser") 
@@ -227,7 +239,8 @@ end
       can :doadmin, User
     end
 
-    unless user.has_role?("fetadmin")
+    if user.has_role?("fetadmin")
+      can :emails,User
     end
     
   end

app/models/attachment.rb

@@ -18,7 +18,7 @@ class Attachment < ActiveRecord::Base
 #  validates :thema, :presence => true
   validates :name, :presence => true
   scope :titlepic, ->{where(flag_titlepic: true)}
-  default_scope order("LOWER(name)")
+  default_scope { order("LOWER(name)") }
   belongs_to :parent, :polymorphic=>true
   def image?
     

app/models/calentry.rb

@@ -14,14 +14,14 @@
 
 class Calentry < ActiveRecord::Base
   attr_accessible :ende, :start, :summary, :typ,:calendar_ids, :calendar, :dauer, :object_id, :object_type
-  belongs_to :calendar
+  belongs_to :calendar, touch: true
   #belongs_to :neuigkeit
   validates :start, :presence => true
   validates :object, :presence => true
   validates :typ, :presence => true
   before_save :get_public
   belongs_to :object, polymorphic: true, touch: true # Objekt zu dem der Calentry gehört (derzeit ein Newsartikel)
-
+  scope :of_month, ->(d) {where("start >= ? AND start <= ?", d.beginning_of_month, d.end_of_month)}
   scope :upcoming, ->{ where("start >= ?", Time.now).order(:start)}
   scope :recent,-> {  where("start <= ?", Time.now).order(:start).reverse_order}
   validate do |entry|
@@ -31,7 +31,10 @@ class Calentry < ActiveRecord::Base
   end  
   
   resourcify
-
+  def  self.updated_at
+    #Calentry.select("MAX(updated_at) as m_updated_at").first.m_updated_at
+    Calentry.all.max_by(&:updated_at).updated_at
+ end
   def is_upcomming?
     self.start > Time.now
   end
@@ -100,6 +103,6 @@ end
       I18n.l(self.start) +" "+ I18n.t("cal.bis")+" "+ I18n.l(self.ende, :format=>format) 
     end
   end
-  scope :public, -> { where(:public => :true) } 
+#  scope :public, -> { where(:public => :true) } 
  # scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 28.days.from_now) }
 end

app/models/comment.rb

@@ -5,9 +5,9 @@ class Comment < ActiveRecord::Base
   acts_as_nested_set  :scope => [:commentable_id, :commentable_type]
   belongs_to :commentable, :polymorphic=> true
   belongs_to :user
-  validate :text, :presence=>true
+  validates :text, :presence=>true
-  validate :user, :presence=>true
+  validates :user, :presence=>true
-  validate :commentable, :presence=>true
+  validates :commentable, :presence=>true
   include IsCommentable
 NUM = {"Beispiel"=> 2, "Survey::Question"=> 7}   
   def parent_object

app/models/document.rb

@@ -3,10 +3,10 @@ class Document < ActiveRecord::Base
   attr_accessible :name, :parent, :text, :typ, :parent_id, :parent_type
 
   belongs_to :parent, :polymorphic => true
-  validate :name, :length=>{minimum:3}
+  validates :name, :length=>{minimum:3}
-  validate :text, :presence=>true
+  validates :text, :presence=>true
-  validate :typ, :presence=>true
+  validates :typ, :presence=>true
-  validate :parent, :presence=>true
+  validates :parent, :presence=>true
   has_paper_trail
   TYPS = { 1=>"fet_docs", 10=>"protocol", 11=> "agenda"}
   has_many :attachments, :as=>:parent
@@ -24,7 +24,7 @@ class Document < ActiveRecord::Base
     "document_"+self.id.to_s
   end
   def self.ether
-    EtherpadLite.connect('http://www.fet.at/etherpad', File.new('/srv/etherpad/etherpad-lite/APIKEY.txt'))
+    EtherpadLite.connect('https://www.fet.at/etherpad', File.new('config/etherpad/APIKEY.txt'))#https://www.etherpad.fet.at
   end
   def create_pdf
       require "open3"
@@ -71,12 +71,21 @@ class Document < ActiveRecord::Base
   def move_to_etherpad
     unless self.is_etherpad?  || self.id.nil?
       self.etherpadkey="document_"+ self.id.to_s
-      self.ep_pad.html = '<div>'+self.text+'</div>'
+
+      if self.text.nil?
+        self.ep_pad.html = '<div>'+"text"+'</div>'
+      else
+        self.ep_pad.html = '<div>'+self.text+'</div>'
+      end
     end
   end
   def dump_to_etherpad
     if self.is_etherpad?
-      self.ep_pad.html = '<div>'+self.text+'</div>'
+      if self.text.nil?
+        self.ep_pad.html = '<div>'+"text"+'</div>'
+      else
+        self.ep_pad.html = '<div>'+self.text+'</div>'
+      end
     else
       self.move_to_etherpad
     end
@@ -102,7 +111,7 @@ class Document < ActiveRecord::Base
     end
     text :name, :boost=>4.0, :stored=> true
     text :meeting, stored: true do |d|
-      (d.parent_type == "Meeting")? d.try(:parent).try(:text).to_s : "" 
+      (d.parent.is_a?(Meeting))? d.try(:parent).try(:text).to_s : ""
     end
   end
   def maketoc

app/models/fetprofile.rb

@@ -32,13 +32,13 @@ class Fetprofile < ActiveRecord::Base
   has_many :nlinks, as: :link
   def validate_birthday
     unless birth_month.nil? || birth_day.nil?
-    unless Date.valid_date?((birth_year.nil?) ? Date.today.year : birth_year, birth_month, birth_day)
+      unless Date.valid_date?((birth_year.nil?) ? Date.today.year : birth_year, birth_month, birth_day)
-      errors.add(:birth_month, "Invalides Datum")
+        errors.add(:birth_month, "Invalides Datum")
-      errors.add(:birth_day, "Invalides Datum")
+        errors.add(:birth_day, "Invalides Datum")
-      v= false
+        v= false
-    else
+      else
-      v= true
+        v= true
-    end
+      end
     else
       v= false
     end
@@ -78,3 +78,5 @@ class Fetprofile < ActiveRecord::Base
   end
 
 end
+ 
+ 

app/models/gallery.rb

@@ -15,7 +15,7 @@ class Gallery < ActiveRecord::Base
   attr_accessible :datum, :desc, :name, :foto_ids
   has_many :fotos, :dependent => :destroy # Delete fotos if gallery is destroyed
   has_many :nlinks, as: :link
-  default_scope order("galleries.datum").reverse_order
+  default_scope { order("galleries.datum").reverse_order }
   searchable do 
     text :desc
     text :name, :boost=>3.0

app/models/gremium.rb

@@ -23,12 +23,16 @@ class Gremium < ActiveRecord::Base
   has_many :memberships, dependent: :destroy # Mitgliedschaften bei dem Gremium
   has_many :nlinks, as: :link, dependent: :destroy
 #  scope :search, ->(query) {where("gremien.name like ? or gremien.desc like ?", "%#{query}%", "%#{query}%")}
+#  has_many :members, through: :memberships
   searchable do
     text :desc
-    text :name, :boost=>4.0
+    text :name
   end
  
   belongs_to :thema # Gehört zu einem Thema
+  validates :name, :presence=>true
+  validates :typ, :presence=>true
+  validates :typ, :inclusion =>{ in: Gremium::TYPEN.keys()}
   scope :tabs, -> { where(:typ => [1,3]).order(:typ).order(:name) } # Gremien die in Tabs angezeigt werden (Alle Anderen nur in der Liste
 
 

app/models/lva.rb

@@ -18,21 +18,6 @@
 #  typ                  :string(255)
 #
 
-# == Schema Information
-#
-# Table name: lvas
-#
-#  id          :integer          not null, primary key
-#  name        :string(255)
-#  desc        :text
-#  ects        :decimal
-#  lvanr       :string(255)
-#  stunden     :decimal
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  modul_id    :integer
-#  semester_id  :integer
-
 class Lva < ActiveRecord::Base
   ERLAUBTE_TYPEN = ['VO', 'UE', 'VU', 'LU', 'SE', 'PR', 'andere'];
   translates :desc,:pruefungsinformation,  :fallbacks_for_empty_translations => true, :versioning=> :paper_trail #true #{:gem=>:paper_trail}
@@ -52,7 +37,7 @@ class Lva < ActiveRecord::Base
 
 #  scope :search, ->(query) {where("name like ? or lvas.desc like ?", "%#{query}%", "%#{query}%")} 
   
-  validates :lvanr,:format=>{ :with => /^[0-9][0-9][0-9]\.[0-9A][0-9][0-9]$/}, :presence=>true, :uniqueness=>true # , :uniqueness=>true # LVA-Nummer muss das Format 000.000 besitzen (uniqueness?) oder 000 für nicht 
+  validates :lvanr,:format=>{ :with => /\A[0-9][0-9][0-9]\.[0-9A][0-9][0-9]\z/}, :presence=>true, :uniqueness=>true # , :uniqueness=>true # LVA-Nummer muss das Format 000.000 besitzen (uniqueness?) oder 000 für nicht 
   validates_presence_of :ects  # ECTS vorhanden?
   validates :name, :presence=>true, :uniqueness=>{:scope=>:typ}# Name Eingetragen?
   validates :typ, :presence=>true, :inclusion=> ERLAUBTE_TYPEN
@@ -113,7 +98,7 @@ class Lva < ActiveRecord::Base
     url
   end
 
-
+  # this should be more DRY
   def load_tissdata
     urlp="https://tiss.tuwien.ac.at/api/course/"+ lvanr.to_s.gsub(".","")+"-"
     begin
@@ -202,7 +187,8 @@ class Lva < ActiveRecord::Base
     end
     
   end
-
+  # Why is this an instance method??
+  # How is it used?
   def update_multiple(hash)
     newlvas=[]
     params["lvas"].each do |i,l|
@@ -237,7 +223,7 @@ class Lva < ActiveRecord::Base
       lecturers.map { |l| l.name }
     end
   end
-
+ # is this used? in which context?
   def self.update_multiple_with_modul(hash,modul)
     newlvas=[]
     hash.each do |i,l|
@@ -263,7 +249,7 @@ class Lva < ActiveRecord::Base
     
   end
 
-
+  # is this used? in which context?
   def read_et_forum
     lva=self
     url=lva.forumlink

app/models/meeting.rb

@@ -1,40 +1,61 @@
+
+# coding: utf-8
+# This class represents a single meeting of a group or the whole Fachschaft.
+# 
 class Meeting < ActiveRecord::Base
-  belongs_to :parent, :polymorphic=>true, touch: true
-  belongs_to :meetingtyp
 
   attr_accessible :desc, :intern, :name, :parent_id, :parent_type, :calentry,:calentry_attributes, :meetingtyp_id
   
+  # Meeting can belong to different kind of parents e.g. topics
+  belongs_to :parent, :polymorphic=>true, touch: true
+  # Each meeting should have a type, for more information see MeetingTyp
+  belongs_to :meetingtyp
+  # Belongs to a news article, that is usually the Announcement of that meeting
   belongs_to :neuigkeit, touch: true
-  has_one :protocol,  :class_name=>'Document', :conditions=>{:typ=>10}, :as=>:parent
+  # has one protocol of type Document, which is of typ=10=protocol
-  has_one :agenda , :as=>:parent,:conditions=>{:typ=>11}, :class_name=>'Document'
+#has_one :test_ol,  :class_name=>'Document',   -> { where(:typ => 10) }
+  
+  has_one :protocol, -> { where(:typ => 10) }, :class_name=>'Document', :as=>:parent
+  
+  # has one agenda of type Document
+  has_one :agenda, -> { where :typ=>11 } , :as=>:parent,  :class_name=>'Document'
+  # has one calentry which contains the date and time of this meeting
   has_one :calentry, as: :object, :dependent=> :destroy
+  # has one calendar through the meetingtyp, thus each meeting is put into a calendar
   has_one :calendar, :through=>:meetingtyp
+  # has one rubrik, thus it is associated to a rubrik
   has_one :rubrik, :through=>:meetingtyp
-  scope :upcomming, includes(:calentry).where("calentries.start>?",1.hour.ago)
+
-  default_scope includes(:calentry).order("calentries.start").reverse_order
+  # scope upcomming only contains meetings in the future and 1 hour into the past 
+  scope :upcomming, -> {includes(:calentry).where("calentries.start>?",1.hour.ago)}
+  default_scope -> { includes(:calentry).order("calentries.start").reverse_order}
   accepts_nested_attributes_for :calentry
-#  validate :agenda, :presence=>true
+
-#  validate :protocol, :presence=>true
+  # Each meeting is required to have a parent otherwise it will not be shown anywhere on the website
-  validate :parent, :presence=>true
+  validates :parent, :presence=>true
-  validate :calentry, :presence=>true
+  # Each meeting needs a calendar entry 
+  validates :calentry, :presence=>true
+
+  
+  # before each validation fix the calendar entry such that it is always 
   before_validation :fix_calentry
   
+  # title is an alias for text
   def title
     self.text
   end
 
+  # Text is a text representation of the meeting
   def text
-    unless self.meetingtyp.try(:name).to_s.empty?  
+    t = self.meetingtyp.try(:name) || self.parent.try(:title) || ""
-      t =  self.meetingtyp.name.to_s+", "
+    t = t + ", " unless t.empty?
-    else
-      t=""
-      t = parent.title.to_s + ", " if self.name.empty?
-    end 
     t= t+ self.name.to_s
- #    t = t + " " + I18n.l(self.calentry.start) unless self.calentry.nil?
     t = t +" "+ I18n.t("date.am")+" "+ self.calentry.text unless self.calentry.nil?
     t
   end
+  
+  # Creante an anouncement with an author
+  # @param user is the author 
   def create_announcement(user)
     if self.neuigkeit.nil?
     n = Neuigkeit.new
@@ -48,32 +69,40 @@ class Meeting < ActiveRecord::Base
     self.neuigkeit= n
     end
   end
+  
+  # Update the title of the announcement to the text of this meeting
+  # @returns [true] if save was successful
   def update_announcement
       n=self.neuigkeit
       n.title=self.text
       n.save
     
   end
+
+  # fixing the calendar entry and the calendar
+  # most importantly the calendar of the calentry 
   def fix_calentry
     self.calentry.object=self unless self.calentry.nil?
     self.calentry.calendar = self.meetingtyp.rubrik.calendar 
   end
+  
   def public? 
     ! (self.intern)
   end
+
+  # Create a Document that is a protocol for the meeting
   def create_protocol
-   if self.protocol.nil?
+   if self.protocol.nil? # if no protocol exists
      d=Document.new
      d.typ=10
      d.name="Protokoll"
-     unless self.meetingtyp.protocol.nil?
-       d.text=self.meetingtyp.protocol.text
-     end
      d.save
      self.protocol=d
    end
-  
+   # what happens if a protocol already exists?
   end
+  
+  # Create a calender entry for this meeting
   def create_calentry
    if  self.calentry.nil?
      ce =Calentry.new
@@ -86,9 +115,6 @@ class Meeting < ActiveRecord::Base
       d=Document.new
       d.typ=11
       d.name="Agenda"
-      unless self.meetingtyp.agenda.nil?
-        d.text=self.meetingtyp.agenda.text
-      end
       d.save
       self.agenda=d
     end
@@ -112,27 +138,17 @@ class Meeting < ActiveRecord::Base
 
   def update_time_from_protocol
     st= /Beginn[\s:]*([^<>]*)/.match(self.protocol.text)[1].to_s
-    st= /Anfang[\s:]*([^<>]*)/.match(self.protocol.text)[1].to_s if st.empty?
+    st= /Anfang[\s:]*([^<>]*)/.match(self.protocol.text)[1].to_s if st.nil? || st.empty?
-    self.calentry.start=(self.calentry.start.to_date.to_s + " " +st).to_datetime unless st.empty?
+    self.calentry.start=(self.calentry.start.to_date.to_s + " " +st).to_datetime unless st.nil? || st.empty?
-    st= /Ende[\s:]*([^<>]*)/.match(self.protocol.text)[1].to_s 
+    st= /Ende[\s:]*([^<>]*)/.match(self.protocol.text).try(:second).try(:to_s )
-   self.calentry.ende=(self.calentry.ende.to_date.to_s + " " +st).to_datetime unless st.empty?
+   self.calentry.ende=(self.calentry.ende.to_date.to_s + " " +st).to_datetime unless st.nil? || st.empty?
   end
   def agenda_text
-      unless self.agenda.nil?
+    return self.agenda.try(:text) || ""
-      t=  self.agenda.text 
-      else
-       t= ""
-      end
-    t
   end
   def protocol_text
- unless self.protocol.nil?
+    return self.protocol.try(:text) || ""
-      t=  self.protocol.text 
+  end
-      else
-       t= ""
-      end
-    t  
-end
 
   searchable do
     text :text

app/models/meetingtyp.rb

@@ -1,11 +1,12 @@
 class Meetingtyp < ActiveRecord::Base
   attr_accessible :agendaintern, :desc, :name, :protocolintern, :rubrik_id, :picture
   belongs_to :rubrik
-  validate :rubrik, :presence=>true
+  validates :rubrik, :presence=>true
+  validates :name, :presence=>true
   has_many :meetings
   has_one :calendar, through: :rubrik
-  has_one :protocol,  :class_name=>'Document', :conditions=>{:typ=>10}, :as=>:parent
+  has_one :protocol, -> {where(:typ=>10)},  :class_name=>'Document', :as=>:parent
-  has_one :agenda , :as=>:parent, :conditions=>{:typ=>11}, :class_name=>'Document'
+  has_one :agenda, -> {where(:typ=>11)} , :as=>:parent, :class_name=>'Document'
   
   mount_uploader :picture, PictureUploader
 

app/models/neuigkeit.rb

@@ -13,7 +13,7 @@
 #
 
 class Neuigkeit < ActiveRecord::Base
-  attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture, :calentries_attributes, :flag_important
+  attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture,:picture_cache, :calentries_attributes, :flag_important
   belongs_to :author, :class_name =>'User'
   belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id"
   has_one :calendar, through: :rubrik
@@ -21,7 +21,7 @@ class Neuigkeit < ActiveRecord::Base
   has_many :nlinks, :dependent=> :destroy
   has_one :meeting
   has_many :attachments, :as=>:parent
-  has_one :title_pic, :class_name=>"Attachment", :as=>:parent, :conditions=>["attachments.flag_titlepic =?", true]
+  has_one :title_pic, -> {where("attachments.flag_titlepic =?", true)}, :class_name=>"Attachment", :as=>:parent
 
   has_many :questions,  :class_name=>"Survey::Question", as: :parent
 
@@ -30,12 +30,13 @@ class Neuigkeit < ActiveRecord::Base
   translates :title,:text, :versioning=>{:gem=>:paper_trail, :options=>{:fallbacks_for_empty_translations => true}}
   globalize_accessors :locales => [:de, :en], :attributes =>[:text,:title]
   mount_uploader :picture, PictureUploader
+  include IsCommentable
 
-  default_scope  order(:cache_order).includes(:calentries).includes(:title_pic)
+  default_scope { order(:cache_order).includes(:calentries).includes(:title_pic) } 
   scope :recent, -> { published.limit(10)}
   scope :unpublished, -> {where("datum > ? OR datum IS NULL", Time.now)}
   scope :published_scope, ->{where("datum <= ? AND datum IS NOT NULL", Time.now)}
-  scope :public, ->{includes(:rubrik).where("rubriken.public"=>true)}
+#  scope :public, ->{includes(:rubrik).where("rubriken.public"=>true)}
   scope :intern, ->{includes(:rubrik).where("rubriken.public"=>false)}
 
 #  scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")}
@@ -44,6 +45,12 @@ class Neuigkeit < ActiveRecord::Base
   before_validation :sanitize
   after_save :update_cache
   attr_accessor :no_fallbacks
+
+  acts_as_flagable
+
+  FLAG_ICONS={"infoscreen" => "fa fa-desktop", "important"=>"fa fa-exclamation"}
+  FLAG_CONFIRM={"infoscreen" => "Neuigkeit am Infoscreen anzeigen"}
+
   def globalize_fallbacks(locale)
     if self.no_fallbacks
     [locale]
@@ -128,6 +135,16 @@ class Neuigkeit < ActiveRecord::Base
 
     end
   end
+  def text_infoscreen_words
+    md = /<p>(?<text>[^\<\>]*)/.match Sanitize.clean(self.text,:elements=>['p'])
+    words=md[:text].split(" ") unless md.nil?
+    if words.nil? || words.empty?
+      "...."
+    else
+      words[0..1000].join(" ")+ " ..." unless  words.nil?
+
+    end
+  end
   def has_calentries?
     !self.calentries.nil? && !self.calentries.empty?
   end
@@ -179,6 +196,6 @@ class Neuigkeit < ActiveRecord::Base
   searchable do
     text :text
     text :datum
-    text :title, :boost=>3.0
+    text :title
   end
 end

app/models/nlink.rb

@@ -5,6 +5,6 @@ class Nlink < ActiveRecord::Base
   validates :neuigkeit, :presence=>true
   validates :link, :presence=>true
   validates :link_id, :uniqueness=>{:scope=>[:neuigkeit_id,:link_type]}
-  default_scope includes(:neuigkeit).order("neuigkeiten.datum").reverse_order
+  default_scope -> {includes(:neuigkeit).order("neuigkeiten.datum").reverse_order}
 
 end

app/models/rubrik.rb

@@ -13,7 +13,7 @@
 class Rubrik < ActiveRecord::Base
   attr_accessible :desc, :name, :prio, :calendar, :public, :icon, :color
   has_many :neuigkeiten, :class_name => "Neuigkeit"
-  has_many :published, :class_name => "Neuigkeit", :conditions=>["Neuigkeit.published"]
+  has_many :published, -> {where(published: True)}, :class_name => "Neuigkeit"
   has_many :calentries, :through => :neuigkeiten, :as=>:object
   resourcify
   has_many :meetingtyps
@@ -42,7 +42,7 @@ end
 
  searchable do
     text :desc
-    text :name, :boost=>4.0
+    text :name
   end
 
 end

app/models/studium.rb

@@ -34,10 +34,10 @@ class Studium < ActiveRecord::Base
   has_many :lvas, :through=>:moduls
   has_many :semester, :dependent => :destroy
   has_many :attachments, :as=>:parent
-validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/}
+  validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/\A[a-zA-z]{0,5}\z/}
   validates :typ, :inclusion => {:in => ["Bachelor","Master"] }
   validates :name, :uniqueness => true, :presence=>true
-  validates :zahl, :presence=>true, :format=>{:with=>/^[0-9A-Z]{4,10}$/}, :uniqueness => true 
+  validates :zahl, :presence=>true, :format=>{:with=>/\A[0-9A-Z]{4,10}\z/}, :uniqueness => true 
 
   mount_uploader :picture, PictureUploader
 
@@ -89,7 +89,7 @@ validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$
      text :zahl 
      text :typ 
      text :abkuerzung
-     text :name, :boost=>3.0
+     text :name
   end
 
 end

app/models/survey/answer.rb

@@ -1,5 +1,5 @@
 class Survey::Answer < ActiveRecord::Base
-  belongs_to :choice, class_name: 'Survey::Choice'
+  belongs_to :choice, class_name: 'Survey::Choice', touch: true
   belongs_to :user
   # attr_accessible :title, :body
 end

app/models/survey/choice.rb

@@ -1,5 +1,5 @@
 class Survey::Choice < ActiveRecord::Base
-  belongs_to :question, class_name: 'Survey::Question'
+  belongs_to :question, class_name: 'Survey::Question', touch: true
   attr_accessible :picture, :sort, :text, :icon, :picture_cache, :remove_picture, :question_id
   has_many :answers, class_name: 'Survey::Answer', dependent: :destroy
   include ActionView::Helpers::TagHelper

app/models/survey/question.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 class Survey::Question < ActiveRecord::Base
   attr_accessible :text, :title, :typ, :choice_ids, :parent_type, :parent_id
-  belongs_to :parent, polymorphic: true
+  belongs_to :parent, polymorphic: true, touch: true
   has_many :choices, dependent: :destroy, class_name: "Survey::Choice"
   has_many :answers, through: :choices
   include IsCommentable

app/models/thema.rb

@@ -24,7 +24,7 @@ class Thema < ActiveRecord::Base
   # Attachments can be all data formats
   has_many :attachments, :as=>:parent
   # attached pics can be used as title pictures
-  has_many :titlepics, :as=>:parent, :class_name=>'Attachment', :conditions=>{:flag_titlepic=>true}
+  has_many :titlepics, -> {where(flag_titlepic: true)}, :as=>:parent, :class_name=>'Attachment'
   # each topic has to belong to one group 
   belongs_to :themengruppe, :foreign_key => "themengruppe_id", :touch=>true
   validates :themengruppe, :presence => true
@@ -41,13 +41,13 @@ class Thema < ActiveRecord::Base
   validates :text, :presence => true
   
   scope :outdated, -> {includes(:translations).where("thema_translations.updated_at<?",7.month.ago).where("thema_translations.locale"=>I18n.locale)}
-  scope :public, where(:isdraft=>false).includes(:themengruppe).where("themengruppen.public"=>true)
+  scope :published,->{ where(:isdraft=>false).includes(:themengruppe).where("themengruppen.public"=>true)}
 
-  default_scope includes(:translations).order("themen.priority").reverse_order
+  default_scope -> {includes(:translations).order("themen.priority").reverse_order}
   # make topic searchable 
   searchable do
     text :text
-    text :title, :boost=>4.0
+    text :title
   end
 
   resourcify  

app/models/themengruppe.rb

@@ -24,7 +24,8 @@ class Themengruppe < ActiveRecord::Base
   translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
   
   scope :intern,-> {where(:public=>false)}
-  scope :public,-> {where(:public=>true)}
+  scope :not_intern, -> {where(:public=>true)}
+  #  scope :public,-> {where(:public=>true)}
 
   def self.find_wiki_default
     where(:wiki_default=>true).first
@@ -40,7 +41,7 @@ end
 
  searchable do
     text :text
-    text :title, :boost=>4.0
+    text :title
   end
 
 end

app/models/user.rb

@@ -29,13 +29,34 @@ class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable,:omniauthable, :omniauth_providers => [:facebook,:ldap]
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable,:omniauthable, :omniauth_providers => [:facebook,:ldap,:developer]
   acts_as_voter
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me, :provider, :uid, :name
 belongs_to :fetprofile
   # attr_accessible :title, :body
-  def self.find_for_facebook_oauth(auth, signed_in_resource=nil)
+
+def self.find_for_developer_oauth(auth, signed_in_resource=nil)
+ # logger.debug("Developer Login started")
+ # logger.debug(auth.info.to_s)
+  
+ # logger.debug(auth.extra.raw_info.to_s)
+  email = auth.info.email.to_s
+  logger.debug("Login E-Mail:"+"'"+ email+"'")
+  user= User.where(:provider=>auth.provider,:uid=>email).first
+  unless user
+    user= User.create(name: email,
+                      provider: auth.provider,
+                      uid: email,
+                      email: email,
+                      password:Devise.friendly_token[0,20])
+    user.add_role("fetuser")
+   
+  end
+  user
+end
+
+def self.find_for_facebook_oauth(auth, signed_in_resource=nil)
 logger.debug auth.to_s
     logger.debug "DDD Username= #{auth.username}"
     user = User.where(:provider => auth.provider, :uid => auth.uid).first

app/themes/blue2/assets/stylesheets/application.css.scss

@@ -1,4 +1,6 @@
+/* This is the main file for theme "blue2"
 
+ */
 /*
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
@@ -10,17 +12,26 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- * require_tree .
+ * ---require_tree .
+
+ *= require blueimp-gallery-all
  *= require jquery.fileupload-ui
  *= require jquery.datetimepicker	
- *= require jquery.ui.dialog
+ *= require jquery-ui/dialog
- *= require jquery.ui.tabs
+ *= require jquery-ui/autocomplete
+ *= require jquery-ui/progressbar
+ *= require jquery-ui/tabs
+
  * require 'bootstrap'
 
  * require 'neuigkeiten'
  */
 
-$color_schema_1: #006599;
+
+//
+
+//Primary blue of this schema
+$color_schema_1: darken(#006599,10%);
 $color_schema_2: #630CE8;
 $color_schema_3: #FF0021;
 $color_schema_4: #E8820C;
@@ -32,7 +43,8 @@ $color_schema_3_dark: darken($color_schema_3, 10%);
 $color_schema_4_dark: darken($color_schema_4, 10%);
 $color_schema_5_dark: darken($color_schema_5, 10%);
 
-$color_prim: $color_schema_1_dark; // #006599; //071672;
+// Primary Color is color number 1
+$color_prim: $color_schema_1; // #006599; //071672;
 $color_prim_light: lighten($color_prim ,10%);
 $color_prim_vlight: lighten($color_prim ,30%);
 $color_prim_dark: darken($color_prim ,10%);
@@ -40,42 +52,45 @@ $color_prim_vdark: darken($color_prim ,30%);
 
 $color_cont: $color_schema_3;
 $color_cont_light:lighten($color_cont ,10%);
-$linkColor: $color_prim;
+
-$linkColorHover: $color_schema_1;
+
-$white: #FFFFFF;
+$link-color: $color_prim;
+$link-hover-color: $color_prim_vlight;
+$link-decoration: none;
 
 $bodyBackground: #FFF; //#FEFEFE;
 
 
 
-
 $navbarBackground:  #FFF; //$color_prim;
 $navbarText: $color_prim; 
 $navbarLinkColor: $color_prim;
-$navbarLinkColorHover: $color_schema_1;
+$navbarLinkColorHover: $color_prim_vlight;
 $dropdownLinkColor: black;
 $navbar-default-brand-color: black;
 $navbarBrandColor:black;
-
+$navbarLinkBackgroundHover: darken($navbarBackground,10%);
 
 $navbarBackgroundHighlight: #FFF;
 //$navbarBackgroundHighlight:#FFFFFF;
 
 
-$navbarLinkBackgroundHover: darken($navbarBackground,10%);
 
-
-$infoBackground:#65A5D1;
-$infoText:#03406A;
 $sansFontFamily: Helvetica, Arial;
 
+$font-family-base: Helvetica, Arial;
+$font-size-base: 0.9rem;
+
 @import 'bootstrap';
-@import 'bootstrap-responsive';
 @import 'bootstrap/image-gallery';
 @import 'font-awesome';
 @import 'neuigkeiten';
 @import 'themengruppen';
 
+
+.navbar-light .navbar-nav a.nav-link {
+   color: $color_prim;
+}
 div.header {		
   display: block; 
 	//  background: url('../../../../header1.png') no-repeat;
@@ -89,22 +104,27 @@ div.header {
   height:45px;
   margin-bottom: 0 px
 }
+
 div.header_span {
-  background:white
+    background:white;
 }
+
 div.header h1 {
   padding:0;
   margin:4px;
   font-size:20px;
   line-height:32px;
 }
+
 div.header img {
 //top:2px;
 //position:relative;
 }
+
 div.navbar {
 border-bottom: $color_prim solid 3px;
 }
+
 div.headerrow {
 }
 
@@ -117,16 +137,16 @@ $navbar-li-minwidth: 0;
 
 
 $box-border: lightgray solid 1px;
-$box-border-radius:4px;
+$box-border-radius:6px;
 $box-background: white;
 
 @import 'layout';
 @import 'calendars';
 @import 'formtastic-bootstrap';
-
+@import 'linkboxes';
 @import 'extra';
 body {
-background: #FFF; //#EFEFEF;
+background: #FCFCFC; //#EFEFEF;
 background-size:100%;
 }
 

app/themes/blue2/assets/stylesheets/archiv/alt.bak

@@ -0,0 +1,49 @@
+
+@import "bootstrap/functions";
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+@import "bootstrap/root";
+@import "bootstrap/reboot";
+@import "bootstrap/type";
+@import "bootstrap/images";
+@import "bootstrap/code";
+@import "bootstrap/grid";
+@import "bootstrap/tables";
+@import "bootstrap/forms";
+@import "bootstrap/buttons";
+@import "bootstrap/transitions";
+@import "bootstrap/dropdown";
+@import "bootstrap/button-group";
+@import "bootstrap/input-group";
+@import "bootstrap/custom-forms";
+@import "bootstrap/nav";
+@import "bootstrap/navbar";
+@import "bootstrap/card";
+@import "bootstrap/breadcrumb";
+@import "bootstrap/pagination";
+@import "bootstrap/badge";
+@import "bootstrap/jumbotron";
+@import "bootstrap/alert";
+@import "bootstrap/progress";
+@import "bootstrap/media";
+@import "bootstrap/list-group";
+@import "bootstrap/close";
+@import "bootstrap/toasts";
+@import "bootstrap/modal";
+@import "bootstrap/tooltip";
+@import "bootstrap/popover";
+@import "bootstrap/carousel";
+@import "bootstrap/spinners";
+@import "bootstrap/utilities";
+@import "bootstrap/print";
+
+
+//$primary: #8F0;
+//$link-color:#FF00FF;
+
+//$infoBackground:#65A5D1;
+//$infoText:#03406A;
+
+$linkColor: $color_prim;
+$linkColorHover: $color_schema_1;
+$white: #FFFFFF;

app/themes/blue2/assets/stylesheets/linkboxes.css.scss

@@ -0,0 +1,142 @@
+ul.linkbox-list
+{ 
+  max-width:70em;
+	margin-left:auto;
+	margin-right:auto;
+}
+
+ul.linkbox-list > li {
+		margin-bottom:0px;
+}
+
+ul.linkbox-list > li:first-child  a.linkbox {
+	border-top-left-radius:$box-border-radius;
+	border-top-right-radius:$box-border-radius;
+	border: $box-border; 
+
+}
+
+ul.linkbox-list > li:last-child  a.linkbox {
+	border-bottom-left-radius:$box-border-radius;
+	border-bottom-right-radius:$box-border-radius;
+}
+
+ul.linkbox-list > li  a.linkbox {
+	border-radius: 0;
+	border-top: none; 
+
+}
+
+ul.linkbox-list > li  a.linkbox:hover {
+		z-index:2000
+}
+a.linkbox, div.contentbox
+{
+	display:block;
+	padding:5px;
+	border-radius:$box-border-radius;
+	border: $box-border; 
+	background: $box-background;	
+}
+
+a.linkbox:hover{ box-shadow: 1px 1px 2px 2px lightgray; }
+
+a.linkbox.color-1 { color:$color_schema_1; }
+a.linkbox.color-2 { color:$color_schema_2; }
+a.linkbox.color-3 { color:$color_schema_3; }
+a.linkbox.color-4 { color:$color_schema_4;}
+a.linkbox.color-5 { color:$color_schema_5;}
+
+a.color-1-dark { color:$color_schema_1_dark;	}
+a.color-2-dark { color:$color_schema_2_dark;	}
+a.color-3-dark { color:$color_schema_3_dark;}
+a.color-4-dark { color:$color_schema_4_dark;}
+a.color-5-dark { color:$color_schema_5_dark;}
+a.color-1-dark:hover { color:$color_schema_1;	}
+a.color-2-dark:hover { color:$color_schema_2;	}
+a.color-3-dark:hover { color:$color_schema_3;	}
+a.color-4-dark:hover { color:$color_schema_4;	}
+a.color-5-dark:hover { color:$color_schema_5;	}
+
+
+a.linkbox li { }
+
+
+ul.linklist {
+		max-width:100%;
+		padding:0;
+		margin:5px;
+}
+ul.linklist li {
+		list-style:none;
+
+}
+ul.linklist li a i{
+		vertical-align:middle;
+		margin-right:6px;
+		font-size:2em;}
+
+ul.linklist > li  a.linkbox {
+	border-radius: 0;
+	border:  $box-border;
+/*  border-color:white;*/
+	padding-top: 7px;
+	margin-bottom:0px;
+	margin-top:0px;
+
+/*	border-bottom: $box-border; 
+	border-top: $box-border; 
+*/
+  border-color:white; 
+/*  border-bottom-color:white; */
+
+}
+ul.linklist > li  a.linkbox:hover {
+
+	border: $box-border; 
+	border-top: $box-border; 
+  box-shadow: none;
+	border-color: black;
+	background: #FCFCFC;
+/*	margin: 0;
+	margin-bottom:0px;*/
+}
+
+
+ul.linklist > li:first-child  a.linkbox {}
+
+ul.linklist > li:last-child  a.linkbox {	
+}
+
+ul.linklist > li:first-child  a.linkbox {
+	border-top-left-radius:$box-border-radius;
+	border-top-right-radius:$box-border-radius;
+/*	border-top:$box-border; */
+	margin-top:0px;
+}
+
+ul.linklist > li:last-child  a.linkbox {
+	border-bottom-left-radius:$box-border-radius;
+	border-bottom-right-radius:$box-border-radius;
+/*	border-bottom:$box-border;*/
+margin-bottom:0px;		
+}
+
+ul.linklist { 
+	border-radius: $box-border-radius;
+	border: $box-border; 
+/* box-shadow: 0px 0px 1px 1px lightgray;*/
+}
+
+
+
+
+span.linklist li a {
+		padding:5px;
+		border: $box-border;
+		background: $box-background;
+		display:block;
+		float:left;	
+
+}
+

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

@@ -9,24 +9,24 @@
 
 <div class="content-wrap content-column" style="max-width:90em;">
  <h1><%= I18n.t('home.willkommen') %></h1>
-<%= raw(@starttopic.text) %>
+<%= raw(@starttopic.text) unless @starttopic.nil? %>
 
 
 <div class="container-fluid">
 <div class="row-fluid">
-<div class="span4">
+<div class="col-md-4">
   
   <ul class="linklist">
     <li>
-      <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
+      <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_facebook_omniauth_authorize_path ,class: :linkbox %>
     </li>
     <li>
-      <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
+      <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path ,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 %></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>
 
@@ -45,15 +45,15 @@
 
 </div>
 
-<div class="span5">
+<div class="col-md-5">
-  <ul class="unstyled linklist">
+  <ul class="unstyled linkbox-list">
 	<% @neuigkeiten.each do |n| %>
 	<li><%= render n if can?(:show, n) %> </li>
 	<% end %>
   </ul>
 </div>
 
-<div class="span3">
+<div class="col-md-3">
 <% cache("calendar_" + cache_array_key(@calentries)+params[:month].to_s+params[:year].to_s) do %>
 <%= render 'calendars/calentries', :object=>@calentries %>
 <% end %>

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

@@ -0,0 +1,59 @@
+<!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 "application", :media=>"all"%>
+      <%= 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">
+	<div class="col-md-10 offset-md-1 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 d-none d-print-block">
+	      <%=  image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
+	      Fachschaft Elektrotechnik 
+	      <hr/>
+
+	    </div>
+	    <div id="menudiv"  class="d-print-none">
+	      <%= render :template => 'layouts/menu' %>
+	    </div>
+			  
+		      </div>     
+		  <% end %>
+	      </div>
+	  </div>
+	  <div class="row">	
+	      <div class="col-md-10 offset-md-1" 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/themes/blue2/views/layouts/menu.html.erb

@@ -0,0 +1,88 @@
+
+
+<div class="navbar navbar-expand-lg navbar-light">
+  <a class="navbar-brand" href="#">	  <%=  image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %></a>
+
+  <button class="navbar-toggler"  type="button" data-toggle="collapse" data-target="#mymenudiv" >
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  
+  <div class="navbar-collapse collapse" id="mymenudiv">
+    <ul class="nav navbar-nav mr-auto">
+      <li class="nav-item"><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path, class: "nav-link" %>
+      </li>
+      <li class="nav-item"> <%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path, class: "nav-link" %></li>
+	  
+	  <li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path , class: "nav-link" %></li>
+	  <li><%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path, class: "nav-link" %></li>
+<% if can? :index, Gallery %>
+	  <li><%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path, class: "nav-link" %></li>
+<% end %>
+	  <li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path, class: "nav-link" %></li>
+	  <li> <%= link_to I18n.t("home.search"), search_home_index_path, class: "nav-link" %></li>
+<li> <%= link_to I18n.t("home.kontakt"), kontakt_home_index_path, class: "nav-link" %></li>
+	 <% if can?(:seeintern, User) %>
+	  <li>
+	    <%= link_to 'Intern' , intern_home_index_path, class: "nav-link"  %>
+	  </li><% end %>
+	</ul>
+	<ul class="nav nav-pills nav-stacked pull-right">
+	<li>
+	
+	  <!-- 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" aria-labelledby="navbarDropdown"  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>
+	<li>
+	  <% if not user_signed_in? %>
+	  <% if Rails.env.development? %>
+	  <%# link_to I18n.t('home.login'), user_developer_omniauth_authorize_path  %>
+	  <%= render 'layouts/login' %>
+	  
+	  <% else %>
+	  <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path(:ldap)  %>
+	  <% end %>
+	  <% else %>
+	  <%= render 'layouts/login' %>
+	  <% end %>
+
+	</li>
+	<li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          Dropdown
+        </a>
+        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+          <a class="dropdown-item" href="#">Action</a>
+          <a class="dropdown-item" href="#">Another action</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="#">Something else here</a>
+        </div>
+      </li>
+</ul>
+
+    <form class="form-inline my-2 my-lg-0">
+      <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
+      <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
+    </form>
+	<!--<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>
+

app/views/beispiele/_beispiel.html.erb

@@ -1,33 +1,22 @@
 <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">
+		<div class="span2" >
-
+			<%= beispiel.lecturer.try(:name).to_s %>
-      <%= 
+		</div>
-	 if can?(:like, beispiel)
+    <div class="span4">
-	 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  
+			<%= flag_link(beispiel, "goodquality")%>
-	 else
+			<%= flag_link(beispiel, "badquality")%>
-	 "liked by " + beispiel.get_likes.size.to_s
+			<%= flag_link(beispiel, "delete")%>
-	 end
+			<%= 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>
-	   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%>
-	<%= 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? %>
@@ -39,4 +28,5 @@
   </div>
   <% end %>
 
+<%= render_comments_for(beispiel) %>
 </div>

app/views/beispiele/_form.html.erb

@@ -12,7 +12,7 @@
       <% end %>
       </div>
   <div class="span6">
-    <% f.file_field :beispieldatei, :label => "Neue Datei hochladen:"%>
+    <%= f.file_field :beispieldatei, :label => "Neue Datei hochladen:" if @beispiel.beispieldatei.nil? || @beispiel.beispieldatei.blank? %>
   </div>
   <%=f.input :datum , :as => :datetimepicker %>
     
@@ -20,11 +20,11 @@
     
 <div class="row-fluid">
   <%= f.input :name %>
-  
+  <%= f.input :lva  if @beispiel.lva.nil?%>
   <%= f.input :desc %>
 </div>
   <div class="span4">
-    <%= f.input :lecturer, :as=>:select, :collection => @beispiel.lva.lecturers %>
+    <%= f.input :lecturer, :as=>:select, :collection => ((@beispiel.lva.nil?|| @beispiel.lva.lecturers.empty?)? Lecturer.all : @beispiel.lva.lecturers) %>
   </div>
 <%= f.hidden_field :beispieldatei_cache %>
 <%= f.actions do %>

app/views/calendars/_calentries.html.erb

@@ -1,3 +1,8 @@
-<%= calendar object do |entry| %>
+<% unless object.nil? %>
+<%= month_calendar events: object do |date, calentries| %>
+<%= I18n.l(date,format: "%d") %>
+<% calentries.each do |entry|  %>
   <div><%= link_to entry.name.to_s, polymorphic_path(entry.object) %></div>
-<% end %>
+  <% end %>
+    <% end %>
+  <% end %>

app/views/calentries/_mail.html.erb

@@ -0,0 +1 @@
+<%= mail.icon_text %>

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

@@ -2,13 +2,14 @@
 <p id="notice"><%= notice %></p>
 <p>  <ul class="linklist">
     <li>
-      <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
+      <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_facebook_omniauth_authorize_path(:facebook) ,class: :linkbox %>
     </li>
     <li>
-      <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
+      <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path(:ldap) ,class: :linkbox %>
     </li>
 </ul>
 </p>
+
 <%= 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>

app/views/documents/_search_results.html.erb

@@ -1,17 +1,19 @@
 <% unless search_results.nil? %>
-<%= search_results  %>
+<%#= search_results  %>
+
+
 <ul>
 	<% search_results.each_hit_with_result  do |hit,result| %>
 		<li> <%= link_to result.parent.title+": " + result.name, document_path(result) %>
 			<%  hit.highlights(:name).each do |hlgt| %>
-				<%= raw(hlgt.format{|word|"<b>#{word}</b>" } ) %>
+				<%= (hlgt.format{|word|"<b>#{word}</b>" } ).html_safe%>
 			<% end 	%>
 			<%  %>
 			<%  hit.highlights(:text).each do |hlgt| %> 
-				<%=  "text:" + raw(hlgt.format {|word| raw("<b>#{word}</b>") })%> 
+				<%=  ("<br>text: " + hlgt.format {|word| "<b>#{word}</b>" }).html_safe%> 
 			<%  end %>
 			<%  hit.highlights(:meeting).each do |hlgt| %>
-				<%=  "text:" + raw(hlgt.format {|word| "*#{word}*" })%> 
+				<%=  "text:" + (hlgt.format {|word| "*#{word}*" }).html_safe%> 
 			<%  end %>
 
 		</li>	

app/views/documents/show.html.erb

@@ -22,7 +22,9 @@
 <ul class='breadcrumb hidden-print'>
 <% @document.versions.each do |v| %>
 <li>
-<%= link_to User.find(v.whodunnit).name+": "+ v.event + " (" +  I18n.l(v.created_at)+ ") ", write_document_path(@document,:versionid=>v.id)  unless v.whodunnit.nil? %>
+  
+<%= link_to User.find(v.whodunnit).try(:name)+": "+ v.event + " (" +  I18n.l(v.created_at)+ ") ", write_document_path(@document,:versionid=>v.id) if User.exists?(v.whodunnit) unless v.whodunnit.nil?  %>
+
 <% end %> <span class="divider">/</span></li>
 </ul>
 <% end %>

app/views/documents/write_etherpad.html.erb

@@ -1 +1 @@
-<%= link_to "weiter" , "http://www.fet.at/etherpad/p/"+@document.ep_pad.id , target: :blank %>
+<%= link_to "weiter" , "https://www.fet.at/etherpad/p/"+@document.ep_pad.id , target: :blank %>

app/views/emails/daily_reminder.html.erb

@@ -0,0 +1,3 @@
+<%=link_to "reminder", daily_reminder_emails_path(params: {send: true}) %>
+<hr>Subject: <b><%= @mail.subject %></b><br>
+<%= raw(@mail.body) %>

app/views/emails/index.html.erb

@@ -0,0 +1 @@
+<%=link_to "reminder", daily_reminder_emails_path() %>

app/views/fetprofiles/_fetprofile.html.erb

@@ -2,3 +2,4 @@
 <%= link_to fetprofile, {class: :linkbox} do %>
  <%= render :partial=>"fetprofiles/compact", :locals=>{:fetprofile=>fetprofile} %>
 <% end %>
+<%= root_path() %>

app/views/fetprofiles/show.html.erb

@@ -51,10 +51,11 @@ end
 	<%= @fetprofile.desc %>
       </p>
       <%= render partial: "interninfo", object: @fetprofile if can?(:seeintern, @fetprofile) %>
+	
       <ul>
 	<% @memberships.each do |m| %>
 	<li>
-	  <%= link_to m.gremium do %> <%= render m %><% end %>
+	  <%= 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>
@@ -64,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/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

@@ -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, 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 %>
@@ -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/admin.html.erb

@@ -2,6 +2,8 @@
 <p>
 <%= link_to "user", users_path %>
 </p>
+
+<p><%= link_to "emails", emails_path %></p>
 <% if Fetsite::Application.config.facebookconfig_enabled %>
 <h2>Facebook Konfiguration</h2>
 <p><%= link_to "Grant extra FB privileges", user_omniauth_authorize_path(:facebook,:params=>{scope:"manage_pages,publish_actions,email"}), :confirm=>"Wirklich?" %>

app/views/home/index.html.erb

@@ -7,55 +7,59 @@
   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 %>
+      <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_facebook_omniauth_authorize_path ,class: :linkbox %>
     </li>
     <li>
-      <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
+      <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path ,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 %></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 %>
+      <%= link_to t1,:class=>:linkbox do %>
-      <%= render partial: "themen/nlink", object: t %>
+      <%= render partial: "themen/nlink", object: t1 %>
-      <%= end %> 
+      <% end %> 
     </li>
     <% end %>
   </ul>
+<% end %> 
+<%= render 'beispiele' %>
 
-  <%= 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>
+  </ul>
-Verschiedene Styles
+</div>
-<ul>
-<li> <%= link_to "Darkblue", home_index_path({:theme=>"darkblue"}) %></li>
-<li> <%= link_to "Blue1", home_index_path({:theme=>"blue1"}) %></li>
 
-<li> <%= link_to "2003", home_index_path({:theme=>"2003"}) %></li>
+<div class="span3">
-<li> <%= link_to "white_1", home_index_path({:theme=>"white_1"}) %></li>
+<% cache("calendar_" + cache_array_key(@calentries)+params[:month].to_s+params[:year].to_s) do %>
-</ul>
+<%= 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>

app/views/home/infoscreen.html.erb

@@ -0,0 +1,103 @@
+
+  <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 "/iframe/infoscreenframe.css" %>
+
+   <%= javascript_include_tag "application" %>
+    <%= javascript_include_tag "jmpress" %>
+
+	</head>
+	<body>
+
+<%= content_tag(:iframe,'', width: "100%", height: "100%", name: "targetframe", allowTransparency:"true", scrolling:"no", frameborder:"0", src: "/iframe/infoscreenframe.html") %> <%#header picture/animation %>
+  <div id ="jmpress">
+  <% i=1  %>
+  <% @neuigkeiten.each do |n| %>
+
+    <div class="step" id="step-<%=i%>" data-x="<%= i *2000 %>" data-y="<%= Random.rand(0..5)*200 %>"  style="position:absolute; height:540px; width:1230px; display: block;" data-duration="10000">
+        <div class="media" style="width:'95%'; height:480px;" >
+    			<div class="pull-left" href="#" style="max-width:250px;">
+              <% unless n.picture_robust.big_thumb.to_s.empty? %>
+            		<p>
+            <br><%= link_to image_tag(n.picture_robust.big_thumb),n.picture_robust.try(:url)  %></p>
+            <% end %>
+            <h3>
+        		<% if n.has_calentries? %>
+      			<div  href="#">
+      				<%= fa_icon("calendar 2x")  %>
+      				<%= n.relevant_calentry.text %>
+      			</div>
+        		<% elsif n.has_meeting? %>
+      			<div  href="#">
+      				<%= fa_icon("calendar 2x")  %>
+      				<%= n.meeting.calentry.text unless n.meeting.calentry.nil? %>
+      			</div>
+
+      		<% end %>
+            	</h3>
+    			</div>
+
+          <div class="media-body">
+      			<h1 itemprop="name">
+      				<%= raw(n.title) %>				<%#= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(n.rubrik, n), remote: true if can? :edit, n %>
+      			</h1>
+      			<div itemprop="articleBody" style="font-size:large">
+      				<%= raw(n.text_infoscreen_words) %>
+      			</div>
+    		  </div>
+      </div>
+  	</div>
+  <%  i = i+1 %>
+  <% end %>
+
+  </div>
+
+    <script>
+      var d = new Date();
+      var n = d.getDay();
+      var now = d.getHours() + "." + d.getMinutes();
+      var weekdays = [
+          ["Sunday"],
+          ["Monday", 9.00, 14.00],
+          ["Tuesday", 9.00, 14.00],
+          ["Wednesday", 9.00, 14.00],
+          ["Thursday", 9.00, 14.00],
+          ["Friday", 9.00, 12.00],
+          ["Saturday"] // we are closed, sorry!
+      ];
+      var day = weekdays[n];
+      if (now > day[1] && now < day[2]) {
+          document.write("<div id='footer' style='background: green; height:25px; width:50px; margin:10px; position:absolute'>");
+          document.write("OPEN");
+          document.write("</div>");
+      }
+       else {
+          document.write("<div id='footer' style='background: red; height:25px; width:60px; margin:10px; position:absolute'>");
+          document.write("CLOSED");
+          document.write("</div>");
+      }
+    </script>
+
+
+
+
+  <script>
+  $(function () {
+  $('#jmpress').jmpress({
+  	initStep: function(element, eventData) {
+  			console.log('We\'re changing to step: #' + $(element).attr('id') + '!');
+  		}
+
+    });
+  setTimeout(function(){
+
+           window.location.reload();
+           /* or window.location = window.location.href; */
+
+  }, 100000);
+
+  });
+  </script>
+	</body>

app/views/home/intern.html.erb

@@ -1,21 +1,49 @@
-<h1> FET Intern NEU </h1>
+<h1> FET Intern NEU blue2</h1>
 <div class="container-fluid">
   <div class="row-fluid">
     <div class="span6">
-<ul class="linklist">
+			<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 "Adressliste", internlist_fetprofiles_path ,class: :linkbox %></li>
+					<%= link_to ff_icon("ffi1-setting")+"Meetings" , meetingtyps_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
- <li>     <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
+				</li>
-</li>
+<li>     
-</ul>
+					<%= 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>  
+				<li>  
-	  <% @themengruppen.each do |themengruppe| %>
+					<% @themengruppen.each do |themengruppe| %>
-	  <div class="container-fluid">
+						<div class="container-fluid">
-	    <%= render themengruppe if can?(:show,themengruppe)%>
+							<%= render themengruppe if can?(:show,themengruppe)%>
-	  </div>
+						</div>
-	  <% end %>
+					<% end %>
-	</li>
+				</li>
       </ul>
 
       <%= link_to "Users", users_path %>
@@ -23,9 +51,9 @@
     <div class="span6">
       <h2>Neuigkeiten</h2>
       <ul class="unstyled linkbox-list">	
-	<% @neuigkeiten.each do |n| %>
+				<% @neuigkeiten.each do |n| %>
-	<li><%= render n if can?(:show, n) %></li>
+					<li><%= render n if can?(:show, n) %></li>
-	<% end %>
+				<% end %>
       </ul>
     </div>
   </div>

app/views/layouts/_login.html.erb

@@ -7,11 +7,11 @@
  <%= current_user.email %> is logged in.
       
     </li>
-<li><%= link_to('Logout', destroy_user_session_path, :method => :delete) %>        </li>
+<li><%= link_to('Logout', destroy_user_session_path, :method => :delete,:id => "login_link") %>        </li>
   </ul>	
 </li>
 <% else %>
 <li>
-  <%= link_to('Login', new_user_session_path)  %>  
+  <%= link_to('Login', new_user_session_path, id:"login_link")  %>  
 </li>
 <% end %>

app/views/layouts/_pretty_toolbar.html.erb

@@ -4,6 +4,7 @@ Verwendung: Aufruf mit
 < % = render :partial=>'layouts/pretty_toolbar', :object=>@foo % > einen beliebigen array @foo übergeben
 
 -->
+<% pretty_toolbar=nil unless defined?(pretty_toolbar) %>
 <% toolbar_elements = !pretty_toolbar.nil? ? pretty_toolbar : @toolbar_elements %>
 <% unless toolbar_elements.nil? || toolbar_elements.empty? %>
 <!--<span class="label"><% I18n.t("common.actions")%></span>

app/views/layouts/application.html.erb

@@ -1,71 +1,66 @@
 <!DOCTYPE html>
 <html>
-
   <head>
+
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" href="<%= absurl("/logo2014_64.png")%>"> 
+    <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 "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty?  %>
-    <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
+      <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
-    <% theme_stylesheet_link_tag "test", :media => "all" %>
+      <%= javascript_include_tag "application" %>
-    <% theme_stylesheet_link_tag "mod", :media=>"all" %>
+      <%= csrf_meta_tags %>
-    <%= javascript_include_tag "application" %>
+      <% if content_for?(:header) %>
-    <%= csrf_meta_tags %>
+	  <%= yield :header %>
-    <% if content_for?(:header) %>
+      <% else %>
-    <%= yield :header %>
+	  <title>Fetsite</title>
-    <% else %>
+      <% end  %>
-    <title>Fetsite</title>
-    <% end  %>
   </head>
 
   <body>
-    <div id="maincontainer" class="container-fluid">
+      <div id="maincontainer" class="container-fluid">
-      <div class="row-fluid">
+	  <div class="row-fluid">
-	<div class="span10 offset1 header_span">
+	      <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 %>
+		  <% 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_wrap">
-	    <div class="header hidden-print">
+			  <div class="header hidden-print">
-	      <%= link_to home_index_path do %>
+			      <%= link_to home_index_path do %>
-	      <!-- <span class="feticon-fet_logo fa-4x color-1"> </span>-->
+				  <!-- <span class="feticon-fet_logo fa-4x color-1"> </span>-->
-	      <%=  image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
+				  <%=  image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
-	      <% end %>
+			      <% end %>
-	    </div>
+			  </div>
-	    <div class="header visible-print">
+			  <div class="header visible-print">
-	    <%=  image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
+			      <%=  image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
-	    </div>
+			  </div>
-	    <div class="visible-print">
+			  <div class="visible-print">
-	      Fachschaft Elektrotechnik 
+			      Fachschaft Elektrotechnik 
-	    <hr/>
+			      <hr/>
-		</div>
+			  </div>
-	    <div id="menudiv" style="margin-top:12px" class="hidden-print">
+			  <div id="menudiv" style="margin-top:12px" class="hidden-print">
-	      <%= render :template => 'layouts/menu' %>
+			      <%= render :template => 'layouts/menu' %>
-	    </div>
+			  </div>
 			  
+		      </div>     
+		  <% end %>
+	      </div>
+	  </div>
+	  <div class="row-fluid">	
+	      <div class="span10 offset1" id="contentdiv">
+		  <%= yield %>
+	      </div>
 	  </div>    
-	  <% end %>
-	</div>
       </div>
-      <div class="row-fluid">	
+      <script>
-	<div class="span10 offset1" id="contentdiv">
+       $('.dropdown-toggle').click(function(e) {
-	  <%= yield %>
+	   e.preventDefault();
-	</div>
+	   setTimeout($.proxy(function() {
-      </div>    
+	       if ('ontouchstart' in document.documentElement) {
-    </div>
+		   $(this).siblings('.dropdown-backdrop').off().remove();
-    <script>
+	       }
-      $('.dropdown-toggle').click(function(e) {
+	   }, this), 0);
-      e.preventDefault();
+       });
-      setTimeout($.proxy(function() {
+      </script>
-      if ('ontouchstart' in document.documentElement) {
-      $(this).siblings('.dropdown-backdrop').off().remove();
-      }
-      }, this), 0);
-      });
-    </script>
   </body>
 </html>

app/views/layouts/menu.html.erb

@@ -1,14 +1,9 @@
-<div class="navbar">
+<div class="navbar navbar-expand-lg navbar-light">
-  <div class="navbar-inner">
+  <button class="navbar-toggler"  type="button" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
-    <div class="container">
+    <span class="navbar-toggler-icon"></span>
-      <!--  <a class="brand" href="#"><% t 'home.mtitle'%></a>-->
+
-      <a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
+    <div class="navbar-collapse collapse">
-	<span class="icon-bar"></span>
+	<ul class="navbar-nav mr-auto nav-pills nav-stacked">
-	<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>
@@ -28,7 +23,7 @@
 	</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">
@@ -44,8 +39,20 @@
 	
 	</ul></div>
 	</li>
-	<%= render 'layouts/login' %>
+	<li>
-</ul>
+	  <% if not user_signed_in? %>
+	  <% if Rails.env.development? %>
+	  <%# link_to I18n.t('home.login'), user_developer_omniauth_authorize_path  %>
+	  <%= render 'layouts/login' %>
+	  
+	  <% else %>
+	  <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path(:ldap)  %>
+	  <% end %>
+	  <% else %>
+	  <%= render 'layouts/login' %>
+	  <% end %>
+
+</li></ul>
 
 	<!--<span class="pull-right"><%if I18n.locale == :en %>
 	  <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%>
@@ -54,9 +61,7 @@
 	  <%end %>
 	</span>-->
 
-      </div>
  
-    </div>
   </div>
 </div>
 

app/views/lvas/show.html.erb

@@ -1,12 +1,10 @@
 <%= content_for :header do %>
-	<title>Fetsite - <%=  @lva.full_name %></title>
+<title>Fetsite - <%=  @lva.full_name %></title>
-	<% set_meta_tags :og => {
+<% set_meta_tags :og => {
-													 :url=>lva_path(:theme=>nil) 
+  :url=>lva_path(:theme=>nil) }
-													 }
+%>
-	%>
+<%= display_meta_tags %>
-	<%= display_meta_tags %>
 <% end %>
-
 <div itemscope itemtype="schema.org/Article" >
   <div class="container-fluid">
     <%= render 'studien/tabs'%>
@@ -14,106 +12,145 @@
     
     <div class="row-fluid">
       <div class="span12">
-				<%= render 'layouts/pretty_toolbar' %>
+	<%= render 'layouts/pretty_toolbar' %>
       </div>
     </div>
+
     <div class="row-fluid">
       <div class="span8">
-				<h1 itemprop="name"><%= @lva.full_name %></h1>
+	<h1 itemprop="name"><%= @lva.full_name %></h1>
-				<meta itemprop="url" content="<%= lva_path(@lva) %>" />
+	<meta itemprop="url" content="<%= lva_path(@lva) %>" />
-				<ul class="linklist">
+	<ul class="linklist">
-					<li>
+	  <li>
-						<%= link_to ffi1_icon("live2")+"ET-Forum", @lva.forumlink, class: :linkbox, itemprop: "discussionUrl" unless @lva.forumlink.nil? or @lva.forumlink.empty?%>
+	    <%= link_to ffi1_icon("live2")+"ET-Forum", @lva.forumlink, class: :linkbox, itemprop: "discussionUrl" unless @lva.forumlink.nil? or @lva.forumlink.empty?%>
-					</li>
+	  </li>
-					<li>
+	  <li>
-						<%= link_to "TISS", @lva.tisslink, class: :linkbox %>
+	    <%= link_to "TISS", @lva.tisslink, class: :linkbox %>
-					</li>
+	  </li>
-				</ul>
+	</ul>
-				<div itemprop="articleBody">
+	<div itemprop="articleBody">
-					<h2><%= I18n.t('lva.pruefungsinfo')%></h2>
+	<h2><%= I18n.t('lva.pruefungsinfo')%></h2>
-					<div class="">
+	<div class="">
-						<%= @lva.pruefungsinformation.to_s.html_safe %>
+	  <%= @lva.pruefungsinformation.to_s.html_safe %>
-					</div>
+	</div>
 
-					<h2><%= I18n.t('lva.lernaufwand')%></h2>
+	<h2><%= I18n.t('lva.lernaufwand')%></h2>
-					<div class="">
+	<div class="">
-						<%= @lva.lernaufwand %>
+	  <%= @lva.lernaufwand %>
-					</div>
+	</div>
+
+	<h2><%= I18n.t('lva.desc')%></h2>
+	<div class="">
+	  <%= @lva.desc.to_s.html_safe %>
+	</div>
+	</div>
 
-					<h2><%= I18n.t('lva.desc')%></h2>
-					<div class="">
-						<%= @lva.desc.to_s.html_safe %>
-					</div>
-				</div>
       </div>
       <div class="span4">
-				<div class="contentbox">
+	<div class="contentbox">
-					<ul>
+	  <ul>
-						<li><b><%= I18n.t('lva.lvanr')%>:</b> <%=@lva.lvanr %></li>
+	    <li><b><%= I18n.t('lva.lvanr')%>:</b> <%=@lva.lvanr %></li>
-						<li><b>ECTS:</b> <%=@lva.ects %></li>
+	    <li><b>ECTS:</b> <%=@lva.ects %></li>
-						<li><b><%= I18n.t('lva.stunden')%>:</b> <%=@lva.stunden %></li>
+	    <li><b><%= I18n.t('lva.stunden')%>:</b> <%=@lva.stunden %></li>
-					</ul>
+	  </ul>
-					<h2><%= I18n.t('lva.module')%></h2>
+	  <h2><%= I18n.t('lva.module')%></h2>
-					<ul>
+	  <ul>
-						<% @lva.modul.each do |modul| %>
+	    <% @lva.modul.each do |modul| %>
-							<li><b><%= link_to modul.name , modul_path(modul)%></b>
+	    <li><b><%= link_to modul.name , modul_path(modul)%></b>
-								<ul>
+	      <ul>
-									<% modul.modulgruppen.each do |g| %>
+		<% 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 %>
+		<li><%= link_to g.studium.title_context , studium_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
-								</ul>
+		<% end %>
-							</li>
+	      </ul>
-						<% end %>
+	    </li>
-					</ul>
+	    
-				</div>
+	    <% end %>
-				<div class="contentbox">
+	  </ul>
-					<h2> <%= I18n.t "lecturers.lecturers" %> </h2>
+	</div>
-					<% @lva.lecturers.each do |lec| %>
+	<div class="contentbox">
-						<%= render :partial=>'lecturers/lec_lva', :object=>lec %>
+	  <h2> <%= I18n.t "lecturers.lecturers" %> </h2>
-					<% end %>
+	  <% @lva.lecturers.each do |lec| %>
-				</div>
+	  <%= render :partial=>'lecturers/lec_lva', :object=>lec %>
+
+	  <% end %>
+	</div>
       </div>
     </div>
-		<div class="row-fluid">
+
+
+    <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| %>
+				<% @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?(: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 %>
+	<% 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">
-			<% unless @lva.nlinks.empty? %> 
+      <div class="span12">
-				<h2><%= I18n.t("rubrik.title") %></h2>
+
-				<% @lva.nlinks.each do |l| %> 
+	<% unless @lva.nlinks.empty? %> 
-						<%= render l.neuigkeit %>
+	<h2><%= I18n.t("rubrik.title") %></h2>
-				<% end %>
+	<% @lva.nlinks.each do |l| %> 
-			<% end %>
+	<%= render l.neuigkeit %>
-    </div></div>
+	<% 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="row-fluid">
-				<div class="span12">
+      <div class="span12">
-					<%= render 'beispiele/form_bulk' %>
+	<%= render 'beispiele/form_bulk' %>
-				</div>
+      </div>
-			</div>
+    </div>
 
     <% end %>
+
     <% unless @crawlobjects.nil? %>
-			<div class="row-fluid">
+    <div class="row-fluid">
-				<div class="span12">
+      <div class="span12">
-					<% @crawlobjects.each do |co| %>
+	<% @crawlobjects.each do |co| %>
-						<%= render co %>
+	<%= render co %>
-					<% end %>
+	<% end %>
-				</div>
+      </div>
-			</div>
+    </div>
     <% end %>
 
   </div>

app/views/neuigkeiten/_mail.html.erb

@@ -0,0 +1,10 @@
+<h1>
+  <%=  mail.title%>
+</h1>
+<%= content_tag(:img,"",src: "http://" + ActionMailer::Base.default_url_options[:host].to_s + mail.picture.big_thumb.url.to_s) %>
+<%=url_for controller: "neuigkeiten",action: :show, :id=>mail.id, only_path: false %>
+<%= raw(mail.text) %>
+<% mail.questions.each do |q| %>
+<%= render partial:"survey/questions/mail", object: q %>
+<% end  %>
+<%= link_to "Auf Fet.at weiterlesen", rubrik_neuigkeit_url(mail.rubrik, mail,:locale=>:de, :theme=>nil) %> 

app/views/neuigkeiten/_menu.html.erb

@@ -0,0 +1,60 @@
+<div class="toolbar-inline">
+	<%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( menu.rubrik,  menu), remote: true , class: "btn", title: "Edit") if can? :edit, menu 
+	%>
+	<span class="btn-group">
+		<%= link_to(fa_icon("paperclip"), "#", 	class: "btn", id: "attachments-form-open", title: "Attachments") if can? :edit, menu 
+		%>	
+		<%= link_to(fa_icon("calendar-o"),	new_calentry_path(:object_id=>menu.id, :object_type=>"Neuigkeit"), 	:remote=>true, class: :btn) if can? :edit, menu 
+		%>
+		<%= link_to(fa_icon("link") , "#", id: "findlink-open",title: "Neue Verknüpfung" , class: "btn") if can? :find_link, menu 
+		%>
+		
+	</span>
+	
+	<%= new_question_for(menu, fa_icon("question")) if can? :new, Survey::Question %>
+ 
+	<span class=" pull-right">
+			<%= flag_link(menu, "important")%>
+			<%= flag_link(menu, "infoscreen")%>
+
+		<%= link_to(fa_icon("globe"), publish_rubrik_neuigkeit_path(menu.rubrik,menu), title:  I18n.t('neuigkeit.publish'), class: "btn") if can?(:publish, menu) && !menu.published? 
+		%>
+		<%= link_to(fa_stack("globe","ban"), unpublish_rubrik_neuigkeit_path(menu.rubrik,menu), :remote=>true, class: "btn stacked") if  can?(:unpublish, menu) && menu.published? 
+		%>
+		<% if menu.published? %>
+			<div class="dropdown" style=" display:inline"">
+				<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#">
+					<%= fa_icon("mail-forward")%><span class="caret"></span>
+				</a>
+				<ul class="dropdown-menu">
+					<%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(menu.rubrik,menu))) if can?(:publish, menu) && menu.published? 
+					%>
+					
+					<%= li_tag(link_to(fa_icon("envelope-o") + " send mail", mail_preview_rubrik_neuigkeit_path(menu.rubrik,menu))) if can?(:publish, menu) && menu.published? 
+					%>
+				</ul>
+			</div>
+		<% end  %>
+	</span>
+	<div class="ui-dialog" id="attachments-form">
+		<%= render_new_attachments_for(menu, fa_icon("plus"), {class: "btn"})  %>
+	</div>
+</div>
+<script>
+$(function(){
+  dialogatt = $( "#attachments-form" ).dialog({
+    autoOpen: false,
+    width: "90%",
+    modal: true,
+    title: "Neue Attachments",
+    buttons: {
+      "Fertig": function() {
+        dialogatt.dialog( "close" );
+      }
+    }
+  });
+  $("#attachments-form-open").on("click",function(){dialogatt.dialog("open")})
+});
+</script>
+
+

app/views/neuigkeiten/_neuigkeit_edit.html.erb

@@ -29,13 +29,18 @@
 		</div>    
   <% end %>
   <div class="media">
-    <% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %>
+
-			<div class="pull-left" href="#">
+			<div class="pull-left" href="#" style="width:200px">
-				<p><br><%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url)  %>
+				<p><br>
+    <% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %><%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url)  %>
+    <% end %>
+	<%= f.input :picture, as: :uploader %>
+					<%= f.hidden_field :picture_cache %>
+
 				</p>
 			</div>
-    <% end %>
+
-    <div class="media-body">
+    <div class="media-body" style="border: dashed black thin">
 			<h1 itemprop="name" class="editable_simple" data-target="#neuigkeit_title">
 				<%=  raw(@neuigkeit.title) %>
 			</h1>

app/views/neuigkeiten/_neuigkeit_view.html.erb

@@ -1,9 +1,22 @@
-<div id="neuigkeit_<%=  neuigkeit_view.id %>" class="contentbox" itemscope itemtype="http://schema.org/Article">
+<% if neuigkeit_view.nil? 
-  <meta itemprop="about" content="<%= neuigkeit_view.text_first_words %>"/>
+neuigkeit_view=@neuigkeit
-  <meta itemprop="sameAs" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/>
+end
-  <meta itemprop="url" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/>
+%>
+<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 class="media">
+	<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>
@@ -15,8 +28,9 @@
 				</span>
 			<% end %>
   </div>
+
   <% unless neuigkeit_view.published? %> 
-    <div class="sticker sticker-red"> Not Published <%= link_to "Publish", publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),remote:true, class: :btn if can? :publish, neuigkeit_view %></div> 
+    <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 %>
@@ -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>
-</div>
+
+
+
+	<% @questions.each do |q| %>
+		<%= render q if can? :show, q %>
+	<% end %>

app/views/neuigkeiten/mail_preview.html.erb

@@ -0,0 +1,5 @@
+<%= link_to "send", mail_preview_rubrik_neuigkeit_path(@neuigkeit) %>
+<%= raw(@mail.subject) %>
+
+<hr />
+<%= raw(@mail.body) %>

app/views/neuigkeiten/show.html.erb

@@ -38,19 +38,15 @@
 	</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 %>
+	<%= render partial: 'neuigkeiten/nlink_list_whole', :object=>@neuigkeit.nlinks %>
 <% end  %>
 
 <div id="findlink-body" class="ui-dialog" style="">
@@ -62,6 +58,7 @@
 		<%= render partial: 'nlink_list_search_whole', object: @nlink_search %>
 	<% end %>
 </div>
+
 <script>
 $(function(){
   dialog = $( "#findlink-body" ).dialog({

app/views/news_mailer/daily_reminder.html.erb

@@ -0,0 +1,13 @@
+<%= stylesheet_link_tag "http://"+ActionMailer::Base.default_url_options[:host].to_s + "/assets/themes/blue2/application.css", :media=>"all"  %>
+
+<% @calentries.each do |ce| %>
+
+<% if can?(:show , ce.object) %>
+	<hr/>
+	<h1>	<%= render partial: "calentries/mail", object: ce %>
+	</h1>
+	<%= render partial: "neuigkeiten/mail", object: ce.object if ce.object.kind_of?(Neuigkeit)%>
+<% end  %>
+
+<% end %>
+	<hr/>

app/views/news_mailer/neuigkeit_mail.html.erb

@@ -4,7 +4,7 @@
 <h1>
   <%=  @neuigkeit.title%>
 </h1>
-<%= content_tag(:img,"",src: "http://"+ActionMailer::Base.default_url_options[:host].to_s+@neuigkeit.picture.big_thumb.url) %>
+<%= content_tag(:img,"",src: "http://"+ActionMailer::Base.default_url_options[:host].to_s+@neuigkeit.picture.big_thumb.url.to_s) %>
 <%=url_for controller: "neuigkeiten",action: :show, :id=>@neuigkeit.id, only_path: false %>
 <%= raw(@neuigkeit.text) %>
 <% @neuigkeit.questions.each do |q| %>

app/views/rubriken/index.html.erb

@@ -11,18 +11,18 @@
 <%= render 'tabs' %>
 <p id="notice"><%= notice %></p>
 <div class="content-wrap content-column">
-	<div class="container-fluid">
+	<div class="container">
-		<div class="row-fluid">
+		<div class="row">
-			<div class="span12">
+			<div class="col">
 
 				<h1><%= I18n.t("rubrik.title")%></h1>
 			</div>
 		</div>
-		<div class="row-fluid">
+		<div class="row">
 
-			<div class="span9">
+			<div class="col-md-9">
 
-				<ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
+				<ul class="list-unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
 					<% @neuigkeiten.each do |n| %>
 						<li><%= render n  %> </li>
 					<% end %>
@@ -33,16 +33,17 @@
 				</div>
 
 			</div>
-
+			<% unless @calentries.nil? or @calentries.empty? or true%>
-			<div class="span3">
+			<div class="col-md-3">
-
+<% 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 %>
 					<%= render 'calendars/calentries', :object=>@calentries %>
 				<% end %>      
+				<% end %>      
 				<% if !current_user.nil? and current_user.has_role?(:fetuser) %>
 				<%= link_to calendars_url(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid) , calendars_path(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid)%>
 					<% end %>
-			</div>
+			</div><% end %>
 		</div>
 	</div>
 </div>

app/views/rubriken/show.html.erb

@@ -17,8 +17,8 @@
 <p id="notice"><%= notice %></p>
 <div class="content-wrap content-column">
 <div class="container-fluid">
-<div class="row-fluid">
+<div class="row">
-<div class="span12">
+<div class="col-md-12">
 
 <h1><%= @rubrik.name %></h1>
 <p>
@@ -31,10 +31,10 @@
   <% end%>
 </i>
 </div></div>
-<div class="row-fluid">
+<div class="row">
 
-<div class="span9">
+<div class="col-md-9">
-<ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
+<ul class="list-unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
 <% @neuigkeiten.each do |neuigkeit| %>
     <%= render neuigkeit, wrap_in: "li" %>
 <% end %>
@@ -46,7 +46,7 @@
 
 </div>
 </div>
-<div class="span3">
+<div class="col-md-3">
 <% unless @calentries.nil? || @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 %>
 <%= render 'calendars/calentries', :object=>@calentries %>

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

@@ -9,7 +9,7 @@
 
 <div class="content-wrap content-column" style="max-width:90em;">
  <h1><%= I18n.t('home.willkommen') %></h1>
-<%= raw(@starttopic.text) %>
+<%= raw(@starttopic.text) unless @starttopic.nil? %>
 
 
 <div class="container-fluid">
@@ -26,7 +26,7 @@
     <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 %></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>
 

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/home/intern.html.erb

@@ -1,58 +0,0 @@
-<h1> FET Intern NEU blue2</h1>
-<div class="container-fluid">
-  <div class="row-fluid">
-    <div class="span6">
-			<div>
-			<ul class="linklist_block">
-				<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>
-			</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,65 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" href="<%= absurl("/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,154 +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) %>
-		<% @questions.each do |q| %>
-			<%= render q if can? :show, q %>
-		<% 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>
-