fixed to string conversion in missing galleries and photos

Gemfile

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

app/assets/stylesheets/infoscreenframe.css

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

app/controllers/application_controller.rb

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

app/controllers/home_controller.rb

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

app/models/ability.rb

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

app/models/document.rb

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

app/views/beispiele/_beispiel.html.erb

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

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

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

app/views/fetprofiles/show.html.erb

@@ -65,13 +65,5 @@ end
     </div>
   </div>
 </div>
-<% if can?(:edit, @fetprofile) %>
+      <%= render 'layouts/pretty_toolbar' %>
-<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

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

app/views/home/index.html.erb

@@ -7,61 +7,53 @@
   fjs.parentNode.insertBefore(js, fjs);
 }(document, 'script', 'facebook-jssdk'));</script>
 
-<div class="content-wrap content-column" style="max-width:90em;">
+<div class="content-wrap content-column" style="max-width:100em;">
  <h1><%= I18n.t('home.willkommen') %></h1>
-<%= raw(@starttopic.text) unless @starttopic.nil? %>
+<%= render partial: "themen/small", object: @starttopic %>
-
-
 <div class="container-fluid">
 <div class="row-fluid">
-<div class="span4">
+<div class="span5">
-  
+
   <ul class="linklist">
-    <li>
-      <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
-    </li>
     <li>
       <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
     </li>
-    <li>  
+
+    <li>
       <%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
     </li>
-    <li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox if Studium.count > 0 %></li>
+    <li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox unless Studium.first.nil? %></li>
     <li><%= link_to "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,:class=>:linkbox do %>
+      <%= link_to t1 do %>
-      <%= render partial: "themen/nlink", object: t1 %>
+      <%= render partial: "themen/nlink", object: t %>
-      <% 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">
-<div class="span5">
+ <ul class="unstyled linkbox-list" style="margin:5px;">
-  <ul class="unstyled linkbox-list">
 	<% @neuigkeiten.each do |n| %>
 	<li><%= render n if can?(:show, n) %> </li>
 	<% end %>
-  </ul>
+      </ul>
-</div>
+Verschiedene Styles
+<ul>
+<li> <%= link_to "Darkblue", home_index_path({:theme=>"darkblue"}) %></li>
+<li> <%= link_to "Blue1", home_index_path({:theme=>"blue1"}) %></li>
 
-<div class="span3">
+<li> <%= link_to "2003", home_index_path({:theme=>"2003"}) %></li>
-<% cache("calendar_" + cache_array_key(@calentries)+params[:month].to_s+params[:year].to_s) do %>
+<li> <%= link_to "white_1", home_index_path({:theme=>"white_1"}) %></li>
-<%= render 'calendars/calentries', :object=>@calentries %>
+</ul>
-<% end %>
 
-
-<div class="fb-like-box" data-href="https://www.facebook.com/FachschaftET" data-colorscheme="light" data-show-faces="true" data-header="true" data-stream="false" data-show-border="true"></div>
 </div>
 </div>
 </div>
 </div>
-

app/views/home/infoscreen.html.erb

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

app/views/home/intern.html.erb

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

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

app/views/layouts/application.html.erb

@@ -1,66 +1,71 @@
 <!DOCTYPE html>
 <html>
-  <head>
 
+  <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" href="https://www.fet.at/logo2014_64.png"> 
     
     <link rel="alternate" hreflang="de" href="<%= url_for(params.merge(:locale=>:de))%>" />
-    <link rel="alternate" hreflang="en" href="<%= url_for(params.merge(:locale=>:en))%>" />
 
-      <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty?  %>
+    <link rel="alternate" hreflang="en" href="<%= url_for(params.merge(:locale=>:en))%>" />
-      <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
+    <!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
-      <%= javascript_include_tag "application" %>
+    <!---->
-      <%= csrf_meta_tags %>
+    
-      <% if content_for?(:header) %>
+    <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty?  %>
-	  <%= yield :header %>
+    <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
-      <% else %>
+    <% theme_stylesheet_link_tag "test", :media => "all" %>
-	  <title>Fetsite</title>
+    <% theme_stylesheet_link_tag "mod", :media=>"all" %>
-      <% end  %>
+    <%= 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 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>     
+	  </div>     
-		  <% end %>
+	  <% end %>
-	      </div>
+	</div>
-	  </div>
-	  <div class="row-fluid">	
-	      <div class="span10 offset1" id="contentdiv">
-		  <%= yield %>
-	      </div>
-	  </div>    
       </div>
-      <script>
+      <div class="row-fluid">	
-       $('.dropdown-toggle').click(function(e) {
+	<div class="span10 offset1" id="contentdiv">
-	   e.preventDefault();
+	  <%= yield %>
-	   setTimeout($.proxy(function() {
+	</div>
-	       if ('ontouchstart' in document.documentElement) {
+      </div>    
-		   $(this).siblings('.dropdown-backdrop').off().remove();
+    </div>
-	       }
+    <script>
-	   }, this), 0);
+      $('.dropdown-toggle').click(function(e) {
-       });
+      e.preventDefault();
-      </script>
+      setTimeout($.proxy(function() {
+      if ('ontouchstart' in document.documentElement) {
+      $(this).siblings('.dropdown-backdrop').off().remove();
+      }
+      }, this), 0);
+      });
+    </script>
   </body>
 </html>

app/views/layouts/menu.html.erb

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

app/views/lvas/show.html.erb

@@ -1,10 +1,12 @@
 <%= 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'%>
@@ -12,145 +14,106 @@
     
     <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>
+					<h2><%= I18n.t('lva.desc')%></h2>
-	<div class="">
+					<div class="">
-	  <%= @lva.desc.to_s.html_safe %>
+						<%= @lva.desc.to_s.html_safe %>
-	</div>
+					</div>
-	</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>
-		<li><%= link_to g.studium.title_context , studium_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
+									<% end %>
-		<% end %>
+								</ul>
-	      </ul>
+							</li>
-	    </li>
+						<% end %>
-	    
+					</ul>
-	    <% end %>
+				</div>
-	  </ul>
+				<div class="contentbox">
-	</div>
+					<h2> <%= I18n.t "lecturers.lecturers" %> </h2>
-	<div class="contentbox">
+					<% @lva.lecturers.each do |lec| %>
-	  <h2> <%= I18n.t "lecturers.lecturers" %> </h2>
+						<%= render :partial=>'lecturers/lec_lva', :object=>lec %>
-	  <% @lva.lecturers.each do |lec| %>
+					<% end %>
-	  <%= render :partial=>'lecturers/lec_lva', :object=>lec %>
+				</div>
-
-	  <% 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>
+				<p><%= I18n.t("lva.ratebsp")%>       <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
-					<%= 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| %>
+				<% @beispiele_all.each do |b| %>
-	<% cache("beispiel_"  +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(: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?(: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 %>
 						<%= 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="row-fluid"> <div class="span12">
-      <div class="span12">
+			<% unless @lva.nlinks.empty? %> 
-
+				<h2><%= I18n.t("rubrik.title") %></h2>
-	<% unless @lva.nlinks.empty? %> 
+				<% @lva.nlinks.each do |l| %> 
-	<h2><%= I18n.t("rubrik.title") %></h2>
+						<%= render l.neuigkeit %>
-	<% @lva.nlinks.each do |l| %> 
+				<% end %>
-	<%= render l.neuigkeit %>
+			<% end %>
-	<% end %>
+    </div></div>
-	<% 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/_neuigkeit_view.html.erb

@@ -1,22 +1,9 @@
-<% if neuigkeit_view.nil? 
+<div id="neuigkeit_<%=  neuigkeit_view.id %>" class="contentbox" itemscope itemtype="http://schema.org/Article">
-neuigkeit_view=@neuigkeit
+  <meta itemprop="about" content="<%= neuigkeit_view.text_first_words %>"/>
-end
+  <meta itemprop="sameAs" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/>
-%>
+  <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>
+  <div class="media">
-<% 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>
@@ -28,7 +15,6 @@ end
 				</span>
 			<% end %>
   </div>
-
   <% unless neuigkeit_view.published? %> 
     <div class="sticker sticker-red"> Not Published <%= link_to "Publish", publish_rubrik_neuigkeit_path(neuigkeit_view.rubrik,neuigkeit_view),remote:true, class: :btn if can? :publish, neuigkeit_view %></div> 
 	<% end %>
@@ -45,7 +31,7 @@ end
     <% 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) %>
@@ -54,19 +40,14 @@ end
   </div>
 
 	<%= render_calentries_for(neuigkeit_view)%>
-	<%= new_calentry_div(neuigkeit_view) %>	
+	
 	<% unless neuigkeit_view.meeting.nil? %>
 		<%= render neuigkeit_view.meeting %>
 	<% end%>
 
 	
 
-	<%= render_attachments_list_for(neuigkeit_view) %>
+	<%= render_attachments_for(neuigkeit_view) %>
-
+	
-	</div>
+	<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
-
+</div>
-
-
-	<% @questions.each do |q| %>
-		<%= render q if can? :show, q %>
-	<% end %>

app/views/neuigkeiten/show.html.erb

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

app/views/rubriken/index.html.erb

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

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

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

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

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

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

@@ -0,0 +1,67 @@
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/de_DE/sdk.js#xfbml=1&appId=120379864660921&version=v2.0";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<div class="content-wrap content-column" style="max-width:90em;">
+ <h1><%= I18n.t('home.willkommen') %></h1>
+<%= raw(@starttopic.text) unless @starttopic.nil? %>
+
+
+<div class="container-fluid">
+<div class="row-fluid">
+<div class="span4">
+  
+  <ul class="linklist">
+    <li>
+      <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
+    </li>
+    <li>
+      <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
+    </li>
+    <li>  
+      <%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
+    </li>
+    <li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox if Studium.count > 0 %></li>
+    <li><%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %></li>
+  </ul>
+
+<% cache("stickytopics_startpage_"+cache_array_key(@stickythemen)) do %>
+  <ul class="linklist">
+    <% @stickythemen.each do |t1| %>
+    <li>
+      <%= link_to t1,:class=>:linkbox do %>
+      <%= render partial: "themen/nlink", object: t1 %>
+      <% end %> 
+    </li>
+    <% end %>
+  </ul>
+<% end %> 
+<%= render 'beispiele' %>
+
+</div>
+
+<div class="span5">
+  <ul class="unstyled linkbox-list">
+	<% @neuigkeiten.each do |n| %>
+	<li><%= render n if can?(:show, n) %> </li>
+	<% end %>
+  </ul>
+</div>
+
+<div class="span3">
+<% cache("calendar_" + cache_array_key(@calentries)+params[:month].to_s+params[:year].to_s) do %>
+<%= render 'calendars/calentries', :object=>@calentries %>
+<% end %>
+
+
+<div class="fb-like-box" data-href="https://www.facebook.com/FachschaftET" data-colorscheme="light" data-show-faces="true" data-header="true" data-stream="false" data-show-border="true"></div>
+</div>
+</div>
+</div>
+</div>
+

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

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

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

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

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

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

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

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

@@ -0,0 +1,72 @@
+<% if neuigkeit_view.nil? 
+neuigkeit_view=@neuigkeit
+end
+%>
+<div id="neuigkeit_<%= neuigkeit_view.id %>" class="contentbox" itemscope itemtype="http://schema.org/Article">
+	<%= meta_itemprop("about", neuigkeit_view.text_first_words) %>
+  <%= meta_itemprop("sameAs", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
+	<%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
+  
+	<div>
+<% cache("menu_neuigkeit"+ neuigkeit_view.id.to_s + can?(:edit,neuigkeit_view).to_s + can?(:find_link, neuigkeit_view).to_s + can?(:new, Survey::Question).to_s + can?(:publish, neuigkeit_view).to_s + can?(:unpublish, neuigkeit_view).to_s + neuigkeit_view.published?.to_s +  neuigkeit_view.flag_important.to_s  +  neuigkeit_view.flag_infoscreen.to_s)  do %>
+		<%= render partial: "menu" , object: neuigkeit_view%>		
+<%  end %>
+	</div>  
+	<div>
+
+		<%#= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
+	</div>
+		<div class="media">
+	  <span itemprop="articleSection">
+			<%= ff_icon(neuigkeit_view.rubrik.icon) unless neuigkeit_view.rubrik.icon.nil? or neuigkeit_view.rubrik.icon.empty? %>&nbsp;<%= neuigkeit_view.rubrik.name %>
+    </span>
+    <span class="pull-right">
+			<span itemprop="author"><%= neuigkeit_view.author.email.to_s unless neuigkeit_view.try(:author).try(:email).to_s %> 
+				<%= neuigkeit_view.author.text %></span>
+			<% unless neuigkeit_view.try(:datum).try(:to_date).nil? %>
+				<%= " "+ I18n.t("neuigkeit.am")+" " %><span itemprop="datePublished"><%= I18n.l(neuigkeit_view.try(:datum).try(:to_date))   %>
+				</span>
+			<% end %>
+  </div>
+
+  <% unless neuigkeit_view.published? %> 
+    <div class="sticker sticker-red"> Not Published <%= link_to "Publish", publish_rubrik_neuigkeit_path(neuigkeit_view.rubrik,neuigkeit_view),remote:true, class: :btn if can? :publish, neuigkeit_view %></div> 
+	<% end %>
+  <% unless neuigkeit_view.origurl.nil? || neuigkeit_view.origurl.empty? %>
+		<div class="alert"><%= link_to "Zitiert von "+ neuigkeit_view.origurl, neuigkeit_view.origurl %>
+		</div>    
+  <% end %>
+  <div class="media">
+    <% unless neuigkeit_view.picture_robust.big_thumb.to_s.empty? %>
+			<div class="pull-left" href="#">
+				<p><br><%= link_to image_tag(neuigkeit_view.picture_robust.big_thumb),neuigkeit_view.picture_robust.try(:url)  %>
+				</p>
+			</div>
+    <% end %>
+    <div class="media-body">
+			<h1 itemprop="name">
+				<%= raw(neuigkeit_view.title) %>				<%#= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(neuigkeit_view.rubrik, neuigkeit_view), remote: true if can? :edit, neuigkeit_view %>
+			</h1>
+			<div itemprop="articleBody">
+				<%= raw(neuigkeit_view.text) %>
+			</div>
+		</div>
+  </div>
+
+	<%= render_calentries_for(neuigkeit_view)%>
+	<%= new_calentry_div(neuigkeit_view) %>	
+	<% unless neuigkeit_view.meeting.nil? %>
+		<%= render neuigkeit_view.meeting %>
+	<% end%>
+
+	
+
+	<%= render_attachments_list_for(neuigkeit_view) %>
+
+	</div>
+
+
+
+	<% @questions.each do |q| %>
+		<%= render q if can? :show, q %>
+	<% end %>

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

@@ -0,0 +1,77 @@
+<%= content_for :header do %>
+	<title>Fetsite - <%=  @neuigkeit.title %> (<%= @neuigkeit.rubrik.name %>)</title>
+	<% set_meta_tags :author => fetprofile_path(@neuigkeit.author.fetprofile) unless @neuigkeit.author.fetprofile.nil? %>
+	<% unless @neuigkeit.picture_robust.url.nil? %>
+		<%	
+		picture_url=URI(root_url)
+		picture_url.path=@neuigkeit.picture_robust.url(:locale=>nil, :theme=>nil) 
+		%>
+	<% end %>
+	<% set_meta_tags :og => 
+	{
+	 :image => picture_url.to_s,
+	 :title => @neuigkeit.title.to_s + " (" + @neuigkeit.rubrik.name.to_s + ")",
+	 :type => "article",
+	 :description =>@neuigkeit.text_first_words,
+	 :url=>neuigkeit_url(:theme=>nil)
+	 }
+	%>
+	<%= display_meta_tags %>
+<% end %>
+
+<%= render 'rubriken/tabs' %>
+
+<div id="fb-root"></div>
+
+<script>(function(d, s, id) {
+	var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/de_DE/sdk.js#xfbml=1&appId=120379864660921&version=v2.0";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<div class="content-column content-wrap">
+	<%= link_to "Refresh", neuigkeit_path(@neuigkeit), remote: true %>
+  <p id="notice">
+		<%= notice %>
+	</p>
+	<%= render partial: "neuigkeit_view", object: @neuigkeit %>
+
+</div>
+<div class="fb-like" data-href"<%= rubrik_neuigkeit_url(@rubrik,@neuigkeit,{themes: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
+
+<%= render_comments_for(@neuigkeit) %>
+
+<%# link_to fa_icon("link") + "Neue Verknüpfung" , "#", id: "findlink-open" if can? :find_link, @neuigkeit %>
+
+<% cache(cache_array_key(@neuigkeit.nlinks, "NLinks")) do %>
+	<%= render partial: 'neuigkeiten/nlink_list_whole', :object=>@neuigkeit.nlinks %>
+<% end  %>
+
+<div id="findlink-body" class="ui-dialog" style="">
+	<% if can? :find_link, @neuigkeit %>
+		Nach Element suchen:
+		<%= semantic_form_for :find_link, :url=>find_link_rubrik_neuigkeit_path(@rubrik,@neuigkeit), :html=>{:id=>"search_form", :method=>'get'} , :remote=> true do |f| %>
+			<%= f.input :query, :input_html => { :name => 'query' },:label=>false %>
+		<% end %>
+		<%= render partial: 'nlink_list_search_whole', object: @nlink_search %>
+	<% end %>
+</div>
+
+<script>
+$(function(){
+  dialog = $( "#findlink-body" ).dialog({
+    autoOpen: false,
+    width: 350,
+    modal: true,
+    title: "Neue Verknüpfung hinzufügen",
+    buttons: {
+      "Fertig": function() {
+        dialog.dialog( "close" );
+      }
+    }
+  });
+  $("#findlink-open").on("click",function(){dialog.dialog("open")})
+});
+</script>

config/routes.rb

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

config/sunspot.yml

@@ -3,7 +3,7 @@ production:
     hostname: localhost
     port: 8080
     log_level: WARNING
-    path: /solr-4.10.2/default #production #ollection1 #production
+    path: /solr/#/default #production #ollection1 #production
 #    solr_home: solr
     # read_timeout: 2
     # open_timeout: 0.5