fixed to string conversion in missing galleries and photos

.gitignore

@@ -52,3 +52,4 @@ Gemfile.lock
 .#*
 .*
 !/.gitignore
+*.pid

Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
-
+gem 'rake', '~>11.0'
 gem 'rails', '3.2.13'
 gem 'sprockets', '2.2.2'
 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 'execjs', '~>1.4.0' 
 
@@ -13,8 +13,8 @@ gem 'webrick', '1.3.1'
 
 # Gems used only for assets and not required
 # in production environments by default.
-  gem 'sass-rails', '~> 3.2'
+  gem 'sass-rails', '~> 3.0'
-  gem 'coffee-rails', '~> 3.2.1'
+  gem 'coffee-rails', '~> 3.0'
   gem 'bootstrap-sass','~> 2.3.2.1'
   
 group :assets do
@@ -60,16 +60,17 @@ gem "paper_trail" , '~>3.0.5'#, :git=>'git://github.com/airblade/paper_trail.git
 
 # User management
 gem "devise" ,'~>2.2.3'
-gem "omniauth"
+gem "omniauth", '~>1.2.2'
-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
 
@@ -84,8 +85,17 @@ gem 'awesome_nested_set'
 gem 'annotate', ">=2.5.0"
 gem 'carrierwave', "~>0.9.0"
 group :development, :test do 
-gem 'factory_girl_rails'
+gem 'factory_girl_rails',"~>4.5.0"
-gem 'rspec-rails'
+gem 'minitest', "~>4.7.5"
+gem 'progress_bar'
+gem 'rspec-core', '~>3.3.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'
 end
 
 gem "simple_calendar", "~> 0.1.9"
@@ -93,7 +103,7 @@ gem 'rmagick'
 
 gem 'bootstrap-addons-rails'
 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"
@@ -125,3 +135,5 @@ gem 'blueimp-gallery'
 gem 'blueimp-gallery-rails'
 
 gem 'shareable'
+
+gem 'sunspot_test'

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

app/assets/stylesheets/application.css.scss

@@ -1,149 +1,123 @@
 
 /*
-* This is a manifest file that'll be compiled into application.css, which will include all the files
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
-* listed below.
+ * listed below.
-*
+ *
-* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * 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.
+ * 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
+ * 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.
+ * compiled file, but it's generally better to create a new file per style scope.
-*= require_self	
+ *
-* require_tree .
+ *= require_self
-*= require 'calendars'
+ * require_tree .
-*= require jquery.fileupload-ui
+ *= require blueimp-gallery-all
-* require 'bootstrap'
+ *= require jquery.fileupload-ui
-*= require 'tinymce'
+ *= require jquery.datetimepicker	
+ *= require jquery.ui.dialog
+ *= require jquery.ui.autocomplete
+ *= require jquery.ui.progressbar
+ *= require jquery.ui.tabs
+ * require 'bootstrap'
+ * require 'neuigkeiten'
+ */
 
-*/
+$color_schema_1: #006599;
-// Colorshema #0A64A4
+$color_schema_2: #630CE8;
-$color_prim: #0A64A4;
+$color_schema_3: #FF0021;
-$color_prim_light: #0B65A5;
+$color_schema_4: #E8820C;
-$color_prim_vlight: #2B85C5;
+$color_schema_5: #FFF30D;
-$color_cont: FFDB73;
+
-$color_cont_light:FFDB73;
+$color_schema_1_dark: darken($color_schema_1, 10%);
-$linkColor: #03006E;
+$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: $color_schema_1_dark; // #006599; //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: $color_schema_3;
+$color_cont_light:lighten($color_cont ,10%);
+$linkColor: $color_prim;
+$linkColorHover: $color_schema_1;
 $white: #FFFFFF;
 
-$bodyBackground: $white;
+$bodyBackground: #EEE;
-$navbarBackground: $color_cont;
-$navbarBackground: #FFFFFF;
 
-$navbarBackgroundHighlight:lighten($navbarBackground,30%);
+
+
+
+$navbarBackground: #EEE;//$color_prim;
+$navbarText: $color_prim; 
+$navbarLinkColor: $color_prim;
+$navbarLinkColorHover: $color_schema_1;
+$dropdownLinkColor: black;
+$navbar-default-brand-color: black;
+$navbarBrandColor:black;
+
+
+$navbarBackgroundHighlight: #EEE;
 //$navbarBackgroundHighlight:#FFFFFF;
 
-$navbarLinkBackgroundHover:#FFBE00;
+
-$navbarLinkBackgroundHover: lighten(#cccccc,10%);
+$navbarLinkBackgroundHover: darken($navbarBackground,10%);
+
+
 $infoBackground:#65A5D1;
 $infoText:#03406A;
 $sansFontFamily: Helvetica, Arial;
+
 @import 'bootstrap';
 @import 'bootstrap-responsive';
 @import 'bootstrap/image-gallery';
-
 @import 'font-awesome';
-
+@import 'neuigkeiten';
-h1 {
+@import 'themengruppen';
-font-size: 23px
-}
-
-h2 { 
-font-size: 19px
-}
-
-body,html { 
-padding:0;
-margin:0;
-
-}
-a:hover {
-text-decoration:none;
-}
 
 div.header { 
-display: block; 
+  display: block; 
-// background: url('/header1.png') no-repeat;
+//  background: url('../../../../header1.png') no-repeat;
-background-color: #FFF;
+//  background-color:white;// $color_prim;
-background-position: right; 
+ // background-position: right; 
-border-bottom:1px solid black; 
+  vertical-align:middle;
-height:41px; 
+  float:left;
-color:#000;
+  color:#000;
-padding-left:87px;
+  padding-top:0px;
-padding-top:0px;
+ overflow:visible;
-overflow:hidden;
+ height:45px;
-margin-bottom: 20px
+  margin-bottom: 0 px
 }
 div.header h1 {
-padding:0;
+   padding:0;
-margin:4px;
+   margin:4px;
-font-size:20px;
+   font-size:20px;
-line-height:32px;
+   line-height:32px;
 }
-#menudiv { 
+div.header img {
-width:100%;
+//top:2px;
+//position:relative;
+}
+div.navbar {
+border-bottom: $color_prim solid 3px;
+}
+div.headerrow {
 }
 
-
+$contentdiv-background:none;
-.navbar .nav li {
+$navbar-li-minwidth: 0;
-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';
+$box-border: #ccc solid 1px;
-@import 'tinymce';
+$box-border-radius:0px;
+$box-background: white;
+
+@import 'layout';
+@import 'linkboxes';
+@import 'calendars';
+@import 'formtastic-bootstrap'

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: 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/blue1/application.css.scss

@@ -16,6 +16,7 @@
  *= require jquery.datetimepicker	
  *= require jquery.ui.dialog
  *= require jquery.ui.autocomplete
+ *= require jquery.ui.progressbar
  *= require jquery.ui.tabs
  * require 'bootstrap'
  * require 'neuigkeiten'
@@ -117,5 +118,6 @@ $box-border-radius:0px;
 $box-background: white;
 
 @import 'layout';
+@import 'linkboxes';
 @import 'calendars';
 @import 'formtastic-bootstrap'

app/assets/stylesheets/themes/blue1/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/blue2/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.
@@ -15,6 +17,8 @@
  *= require jquery.datetimepicker	
  *= require jquery.ui.dialog
  *= require jquery.ui.tabs
+ *= require jquery.ui.progressbar
+
  * require 'bootstrap'
 
  * require 'neuigkeiten'
@@ -89,9 +93,11 @@ div.header {
   height:45px;
   margin-bottom: 0 px
 }
+
 div.header_span {
   background:white
 }
+
 div.header h1 {
   padding:0;
   margin:4px;
@@ -117,16 +123,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/assets/stylesheets/themes/blue2/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/controllers/application_controller.rb

@@ -16,7 +16,13 @@
 
       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] || ht || I18n.default_locale
     
 
     session[:locale] = I18n.locale
@@ -46,7 +52,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 +62,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,16 @@ 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 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")
@@ -111,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/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
  
 
 
@@ -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

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/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/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,12 @@ 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") || 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
@@ -152,6 +161,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 +169,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 +180,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 +242,8 @@ end
       can :doadmin, User
     end
 
-    unless user.has_role?("fetadmin")
+    if user.has_role?("fetadmin")
+      can :emails,User
     end
 
   end

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

app/models/document.rb

@@ -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/gremium.rb

@@ -23,9 +23,10 @@ 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

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
@@ -30,6 +30,7 @@ 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)
   scope :recent, -> { published.limit(10)}
@@ -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/rubrik.rb

@@ -42,7 +42,7 @@ end
 
  searchable do
     text :desc
-    text :name, :boost=>4.0
+    text :name
   end
 
 end

app/models/studium.rb

@@ -34,7 +34,7 @@ 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-zA-z]{0,5}$/}
   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 
@@ -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

@@ -47,7 +47,7 @@ class Thema < ActiveRecord::Base
   # make topic searchable 
   searchable do
     text :text
-    text :title, :boost=>4.0
+    text :title
   end
 
   resourcify  

app/models/themengruppe.rb

@@ -40,7 +40,7 @@ end
 
  searchable do
     text :text
-    text :title, :boost=>4.0
+    text :title
   end
 
 end

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/calentries/_mail.html.erb

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

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

@@ -9,7 +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>
 
@@ -23,4 +23,6 @@
   <div><%= f.submit "Sign in" %></div>
 <% end %>
 
+-->
+
 <%= render "devise/shared/links" %>

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>

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

@@ -15,9 +15,6 @@
 <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>
@@ -25,7 +22,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 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>
@@ -60,4 +57,3 @@ Verschiedene Styles
 </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

@@ -7,7 +7,9 @@
       <%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %></li>
  <li>     <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
 </li>
-</ul>
+<li>
+<%= link_to ff_icon("ffi1-setting")+"Neue Oberfläche" , set_preferred_theme_user_path(current_user, params: {theme: "blue2"}), class: :linkbox if can? :set_preferred_theme , current_user %>
+</li></ul>
       <ul class="unstyled linkbox-list">
 	<li>  
 	  <% @themengruppen.each do |themengruppe| %>

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/_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/application.html.erb

@@ -3,7 +3,7 @@
 
   <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))%>" />
 

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/_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

@@ -16,7 +16,7 @@
 			<% 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 %>

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

@@ -33,16 +33,17 @@
 				</div>
 
 			</div>
-
+			<% 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 %>
 					<%= 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/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/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

@@ -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>
 
@@ -46,7 +46,7 @@
 </div>
 
 <div class="span5">
-  <ul class="unstyled linklist">
+  <ul class="unstyled linkbox-list">
 	<% @neuigkeiten.each do |n| %>
 	<li><%= render n if can?(:show, n) %> </li>
 	<% end %>

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

@@ -3,7 +3,7 @@
   <div class="row-fluid">
     <div class="span6">
 			<div>
-			<ul class="linklist_block">
+			<ul class="linklist">
 				<li>
 					<%= link_to fa_icon("list")+"Adressliste", internlist_fetprofiles_path ,class: :linkbox %>
 				</li>
@@ -19,6 +19,10 @@
 <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

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

@@ -1,65 +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))%>" />
 
-    <%= 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? %>
-    <%= javascript_include_tag "application" %>
+      <%= javascript_include_tag "application" %>
-    <%= csrf_meta_tags %>
+      <%= csrf_meta_tags %>
-    <% if content_for?(:header) %>
+      <% if content_for?(:header) %>
-			<%= yield :header %>
+	  <%= yield :header %>
-    <% else %>
+      <% else %>
-			<title>Fetsite</title>
+	  <title>Fetsite</title>
-    <% end  %>
+      <% 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>
-      <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/themes/blue2/lvas/show.html.erb

@@ -82,9 +82,12 @@
     <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>
@@ -93,7 +96,7 @@
 				</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 %>
+	<% 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 %>
@@ -108,6 +111,7 @@
 				<% 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 %>

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

@@ -1,57 +1,43 @@
 <div class="toolbar-inline">
-	<%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik,  @neuigkeit), remote: true , class: "btn", title: "Edit") if can? :edit, @neuigkeit 
+	<%= 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"), "#", \ 
+		<%= link_to(fa_icon("paperclip"), "#", 	class: "btn", id: "attachments-form-open", title: "Attachments") if can? :edit, menu 
-								class: "btn", id: "attachments-form-open", title: "Attachments") \ 
-									if can? :edit, @neuigkeit 
 		%>	
-		<%= link_to(fa_icon("calendar-o"), \
+		<%= link_to(fa_icon("calendar-o"),	new_calentry_path(:object_id=>menu.id, :object_type=>"Neuigkeit"), 	:remote=>true, class: :btn) if can? :edit, menu 
-								new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), \
-								:remote=>true, class: :btn) \
-									if can? :edit, @neuigkeit 
 		%>
-		<%= link_to(fa_icon("link") , "#", \ 
+		<%= link_to(fa_icon("link") , "#", id: "findlink-open",title: "Neue Verknüpfung" , class: "btn") if can? :find_link, menu 
-								id: "findlink-open",title: "Neue Verknüpfung" , class: "btn") \
-									if can? :find_link, @neuigkeit 
 		%>
 		
 	</span>
 	
-	<%= new_question_for(@neuigkeit, fa_icon("question")) if can? :new, Survey::Question %>
+	<%= new_question_for(menu, fa_icon("question")) if can? :new, Survey::Question %>
  
 	<span class=" pull-right">
-		<%= link_to(fa_icon("globe"), \ 
+			<%= flag_link(menu, "important")%>
-								publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), \
+			<%= flag_link(menu, "infoscreen")%>
-								title:  I18n.t('neuigkeit.publish'), class: "btn") \
+
-									if can?(:publish, @neuigkeit) && !@neuigkeit.published? 
+		<%= 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"), \ 
+		<%= link_to(fa_stack("globe","ban"), unpublish_rubrik_neuigkeit_path(menu.rubrik,menu), :remote=>true, class: "btn stacked") if  can?(:unpublish, menu) && menu.published? 
-								 unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), \
-								 :remote=>true, class: "btn stacked") \
-									 if  can?(:unpublish, @neuigkeit) && @neuigkeit.published? 
 		%>
-		<% if @neuigkeit.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", \
+					<%= 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? 
-														 publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) \
-														 if can?(:publish, @neuigkeit) && @neuigkeit.published? 
 					%>
 					
-					<%= li_tag(link_to(fa_icon("envelope-o") + " send mail", \
+					<%= li_tag(link_to(fa_icon("envelope-o") + " send mail", mail_preview_rubrik_neuigkeit_path(menu.rubrik,menu))) if can?(:publish, menu) && menu.published? 
-														 mail_to_fet_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)))  \ 
-														 if can?(:publish, @neuigkeit) && @neuigkeit.published? 
 					%>
 				</ul>
 			</div>
 		<% end  %>
 	</span>
 	<div class="ui-dialog" id="attachments-form">
-		<%= render_new_attachments_for(@neuigkeit, fa_icon("plus"), {class: "btn"})  %>
+		<%= render_new_attachments_for(menu, fa_icon("plus"), {class: "btn"})  %>
 	</div>
 </div>
 <script>

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

@@ -1,11 +1,15 @@
+<% 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() do %>
+<% 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" %>		
+		<%= render partial: "menu" , object: neuigkeit_view%>		
 <%  end %>
 	</div>  
 	<div>
@@ -26,7 +30,7 @@
   </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 %>

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

@@ -41,8 +41,9 @@
 </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 %>

app/views/users/index.html.erb

@@ -33,7 +33,7 @@
     </td>
     <td>
       <%= semantic_fields_for "users[#{user.id}]", user do |f|%>
-      <%= f.input :fetprofile ,:label=>false , :as=>:select , :collection=>Fetprofile.all %>
+      <%= f.input :fetprofile ,:label=>false , :as=>:select , :collection=>Fetprofile.order(:vorname,:nachname) %>
 
       <% end %>
     </td>

config/environments/development.rb

@@ -16,7 +16,7 @@ Fetsite::Application.configure do
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.delivery_method =:sendmail
-  config.action_mailer.default_url_options = {}#{:host=> "localhost", :port=>3000} #  :host => 'glonass.htu.tuwien.ac.at' }
+  config.action_mailer.default_url_options = {:host=> "localhost", :port=>3000} #  :host => 'glonass.htu.tuwien.ac.at' }
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 

config/environments/production.rb

@@ -31,7 +31,7 @@ Fetsite::Application.configure do
   # config.force_ssl = true
 
   # See everything in the log (default is :info)
-  config.log_level = :debug
+  config.log_level = :info
 
   # Prepend all log lines with the following tags
   config.log_tags = [ :remote_ip , :uuid ]
@@ -66,6 +66,6 @@ Fetsite::Application.configure do
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
-  config.facebookconfig_enabled=true
+  config.facebookconfig_enabled=false
 
 end

config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += ['blueimp-gallery-all.js']
+Rails.application.config.assets.precompile += ['blueimp-gallery-all.js', 'jmpress.js']

config/initializers/sunspot.rb

@@ -0,0 +1,74 @@
+# config/initializers/sunspot.rb
+module Sunspot
+  # 
+  # DataExtractors present an internal API for the indexer to use to extract
+  # field values from models for indexing. They must implement the #value_for
+  # method, which takes an object and returns the value extracted from it.
+  #
+  module DataExtractor #:nodoc: all
+    # 
+    # AttributeExtractors extract data by simply calling a method on the block.
+    #
+    class AttributeExtractor
+      def initialize(attribute_name)
+        @attribute_name = attribute_name
+      end
+
+      def value_for(object)
+        Filter.new( object.send(@attribute_name) ).value
+      end
+    end
+   # 
+    # BlockExtractors extract data by evaluating a block in the context of the
+    # object instance, or if the block takes an argument, by passing the object
+    # as the argument to the block. Either way, the return value of the block is
+    # the value returned by the extractor.
+    #
+    class BlockExtractor
+      def initialize(&block)
+        @block = block
+      end
+
+      def value_for(object)
+        Filter.new( Util.instance_eval_or_call(object, &@block) ).value
+      end
+    end
+
+    # 
+    # Constant data extractors simply return the same value for every object.
+    #
+    class Constant
+      def initialize(value)
+        @value = value
+      end
+
+      def value_for(object)
+        Filter.new(@value).value
+      end
+    end
+
+    # 
+    # A Filter to allow easy value cleaning
+    #
+    class Filter
+      def initialize(value)
+        @value = value
+      end
+      def value
+        strip_control_characters @value
+      end
+      def strip_control_characters(value)
+        return value unless value.is_a? String
+
+        value.chars.inject("") do |str, char|
+          unless char.ascii_only? and (char.ord < 32 or char.ord == 127)
+            str << char
+          end
+          str
+        end
+
+      end
+    end
+
+  end
+end

config/locales/de.yml

@@ -16,6 +16,7 @@ de:
     savecont: "Zwischenspeichern"
     intern: "Intern"
     manage: "Verwalten"
+    new: "Neu"
   home:
     sprache: "Deutsch"
     kontakt: "Kontakt"

config/locales/fetprofile_public.de.yml

@@ -6,6 +6,7 @@ de:
     active_members: "Aktive Mitglieder"
     notactive_members: "Pension"
     new_profile: "Neues Profil anlegen"
+    new: "Neues Profil anlegen"
   gremium:
     new: "Neues Gremium"
     seit: "seit"

config/routes.rb

@@ -8,7 +8,20 @@
        resources :comments, contstraints: {id: /[0-9]+/}, only: :show
 
 
-    
+## Inserted for testing tests
+      resources :members , controller: :fetprofiles , as: :fetprofiles do
+        collection do
+          get 'verwalten'
+          get 'internlist'
+        end
+      end
+     resources :gremien do
+        collection do
+          get 'verwalten'
+        end
+      end
+#
+    # #-------------------------
 
    namespace :survey do
      resources :questions do
@@ -26,7 +39,12 @@
   themes_for_rails
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
   resources :home, :only=>[:index] do
-  end
+end
+resources :emails, :only=>[:index] do
+     collection do
+ get :daily_reminder
+    end
+end
   get ':locale', constraints: {locale: /en|de/}, action: :language,controller: :home, as: "language"
   scope '(:locale)/admin' do
     resources :users, :only=>[]  do
@@ -35,6 +53,7 @@
         post :all_update
       end
       member do
+         get :set_preferred_theme
         get :fb_set_default_publish_page
       end
     end
@@ -60,6 +79,8 @@
     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
@@ -125,12 +146,12 @@
           get 'verwalten'
         end
       end
-      resources :fetprofiles, as: :fetprofiles_bak do
+#      resources :fetprofiles, as: :fetprofiles_bak do
-        collection do 
+#        collection do
-          get 'verwalten'
+#          get 'verwalten'
-          get 'internlist'
+#          get 'internlist'
-        end
+#        end
-      end
+#      end
       resources :members , controller: :fetprofiles , as: :fetprofiles do
         collection do
           get 'verwalten'
@@ -165,7 +186,7 @@
             get 'publish_to_facebook'
             get 'mail_to_fet'
             get 'mail_preview'
- 
+             get 'flag'
           end
           collection do
             get 'newsletter_preview'
@@ -255,5 +276,3 @@
   end
   root :to => 'home#index'
 end
-
-

config/sunspot.yml

@@ -3,17 +3,22 @@ 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
 
 development:
   solr:
-    hostname: localhost
+    hostname: triton-amp.local
-    port: 8982
+    port: 8080
     log_level: INFO
-    path: /solr/development
+    path: /solr/mycore
+#  solr:
+#    hostname: localhost
+#    port: 8983
+#    log_level: INFO
+#    path: /solr/mycore
     
 test:
   solr:

config/unicorn.rb

@@ -0,0 +1,45 @@
+# config/unicorn.rb
+
+worker_processes Integer(ENV["WEB_CONCURRENCY"] || 5)
+timeout 60
+preload_app true
+listen "/var/run/fetsite.sock"
+stderr_path "/var/log/unicorn.log"
+stdout_path "/var/log/unicorn.log"
+
+before_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
+    Process.kill 'QUIT', Process.pid
+  end
+
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.connection.disconnect!
+end
+
+after_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
+  end
+
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.establish_connection
+  begin
+    uid, gid = Process.euid, Process.egid
+    user, group = 'fetsite', 'nogroup'
+    target_uid = Etc.getpwnam(user).uid
+    target_gid = Etc.getgrnam(group).gid
+    worker.tmp.chown(target_uid, target_gid)
+    if uid != target_uid || gid != target_gid
+      Process.initgroups(user, target_gid)
+      Process::GID.change_privilege(target_gid)
+      Process::UID.change_privilege(target_uid)
+    end
+  rescue => e
+    if RAILS_ENV == 'development'
+      STDERR.puts "couldn't change user, oh well"
+    else
+      raise e
+    end
+  end
+end

db/migrate/20150913090628_add_infoscreen_to_neuigkeit.rb

@@ -0,0 +1,7 @@
+class AddInfoscreenToNeuigkeit < ActiveRecord::Migration
+  def change
+    add_column :neuigkeiten, :flag_infoscreen, :boolean, default: false
+    add_column :themen, :flag_infoscreen, :boolean, default: false
+
+  end
+end

initscript.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 ruby_command="ruby"
 rake_command="rake"
-bundler_command="bundler"
+bundler_command="bundle"
 
 # Are the necessary programs installed?
 command -v $ruby_command >/dev/null 2>&1 || { echo >&2 "The given ruby command does not exist. Please change the command or install ruby"; exit 1; }
@@ -14,19 +14,21 @@ echo "Generating base configs..."
 # Generate clean config files if they don't exist
 cp -u config/database.yml.example config/database.yml
 cp -u config/omniauth_secrets.yml.example config/omniauth_secrets.yml
-
+touch config/crawl_config.yml
 echo "Bundle install..."
 # Run Bundler
-$bundler_command install || {echo "Bundler failed. Please run \"$bundle\_command install\" seperately and debug the errors, before running this script again";exit 1;}
+$bundler_command install || { echo "Bundler failed. Please run \"$bundle\_command install\" seperately and debug the errors, before running this script again";exit 1; }
 
 echo "Migrate the database..."
 # Run the migration
-$rake_command db:migrate ||{echo "Migration failed. Please run \"$rake\_command db:migrate\" seperately and debug the errors, before running this script again"; exit 1;}
+$rake_command db:migrate || { echo "Migration failed. Please run \"$rake\_command db:migrate\" seperately and debug the errors, before running this script again"; exit 1; }
+
 
 echo "Start the sunspot server"
 # Run Sunspot
 $rake_command sunspot:solr:stop &> /dev/null
 $rake_command sunspot:solr:start || exit 1
+bundle exec sunspot-solr start -p 8982 
 
 # Topic 1 is supposed to be the startpage topic
 if [ ! -f config/start_topic.yml ]; then
@@ -34,7 +36,7 @@ if [ ! -f config/start_topic.yml ]; then
     echo "1" > config/start_topic.yml
 fi
 
-# Generate fetadmin user "admin@fet.at", password: 12345678
+touch config/crawl_config.yml
 
 
 

public/assets/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: 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;
+    }
+}

public/iframe/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: 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;
+    }
+}

public/iframe/infoscreenframe.html

@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="de">
+
+<head>
+    <meta charset="utf-8">
+    <title>Infoscreen</title>
+    <style media="screen">
+        pre.code {
+            -moz-border-radius: 10px;
+            -webkit-border-radius: 10px;
+            border-radius: 10px;
+            padding: 10px;
+            height: 280px;
+            overflow: auto;
+            background: #181818;
+            border: solid 2px #181818;
+        }
+
+        #codelines {
+            display: none;
+        }
+
+        #svg {
+            -moz-border-radius: 10px;
+            -webkit-border-radius: 10px;
+            border-radius: 10px;
+            border: solid 2px #ccc;
+            width: 300px;
+            height: 300px;
+            float: left;
+            margin-right: 10px;
+            font: 1em source-sans-pro, Source Sans Pro, Helvetica, sans-serif;
+        }
+
+    </style>
+
+
+
+    <link rel="stylesheet" href="./infoscreenframe.css">
+
+
+</head>
+
+<body>
+    <div class="header">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1280 200">
+     <path id="impulsPath" class="impulsPath" d="M0,61.43H1018c2.41,0,6.77-2.28,9.12-2.28,2.66,0,8.3,6.58,11.65,6.58,3.16,0,7.47-15.07,10-15.07,4.3,0,10.38,29.62,14.18,29.62s11.89-55.47,13.67-55.47c5.32,0,10.63,86.34,14.18,86.34,4.3,0,10.63-111.15,13.42-111.15,3.54,0,8.86,123.56,13.17,123.56,3.8,0,8.36-116.85,13.55-116.85,3.42,0,8.74,100,13.67,100,3.67,0,9.24-71.15,12.91-71.15,3.42,0,10.51,41.78,12.91,41.78,3.42,0,8.48-24.56,12.41-24.56,4.43,0,7.93,12.91,12.41,12.91,5.7,0,8.3-6.58,11.65-6.58s6.77,2.28,9.12,2.28h64"/>
+     <g id="FET-logotext"><g id="F"><path d="M1042,82.71l12.7-35.9v-.1c.2-.3,3.8-8.5,13.1-9.6h37.9l-4,11.6h-25.8a7.19,7.19,0,0,0-4.8,3.7l-.6,1.6h14.1l-4.1,11.7h-14l-6.1,17Z"/><path class="FET-logotext-stroke" d="M1102.9,39l-2.6,7.6h-24.6a9.18,9.18,0,0,0-6.4,5l-1.6,4.4h14.1l-2.7,7.7h-14l-6.1,17h-14.2l11.7-33.2s3.3-7.5,11.5-8.5h34.9m5.7-4h-40.9c-10.4,1.3-14.5,10.4-14.7,10.8l-.1.1V46L1041,79.31l-1.9,5.3h22.7l.9-2.7,5.1-14.4H1082l.9-2.7,2.7-7.7,1.9-5.3h-13.7a5.48,5.48,0,0,1,2.3-1.4h27.1l.9-2.7,2.6-7.6,1.9-5.1Z"/></g><g id="E"><path d="M1101.3,82.71h-.2a8.59,8.59,0,0,1-6.2-3.8,9.86,9.86,0,0,1-.7-7.9l8.8-24.9.1-.1c.2-.3,4.3-8.1,13.3-9H1154l-4,11.7-26-.1a7.1,7.1,0,0,0-4.6,3.7l-.6,1.7h14.1l-4.1,11.7h-14.2l-1.1,3.1a2.37,2.37,0,0,0,.2,1.6,2.23,2.23,0,0,0,1.2.7h27l-4,11.7h-36.6Z"/><path class="FET-logotext-stroke" d="M1151.2,39l-2.6,7.7-24.8-.1a9.21,9.21,0,0,0-6.2,5l-1.7,4.4H1130l-2.7,7.7h-14.1l-1.6,4.5s-1.1,4.1,3,4.9H1139l-2.6,7.7h-35c-7.8-1.3-5.3-9.1-5.3-9.1l8.7-24.6s3.7-7.1,11.7-7.9l34.7-.2m5.6-4h-40.6c-10.1,1-14.7,9.7-14.9,10l-.1.3-.1.3-8.7,24.6v.2c-.2.5-1.6,5.4.9,9.6a10.41,10.41,0,0,0,7.5,4.7l.3.1h38.2l.9-2.7,2.6-7.7,1.8-5.3h-29l.5-1.4h14.1l.9-2.7,2.7-7.7,1.9-5.3H1122a6.42,6.42,0,0,1,2.2-1.4l24.3.1h2.9l.9-2.7,2.6-7.7,1.9-5.3Z"/></g><g id="T"><path d="M1154.3,82.71l12-34-15.1-.1.9-2.6a14.39,14.39,0,0,1,11.5-9H1204l-4.1,11.7h-15l-12.1,34.1h-18.5Z"/><path class="FET-logotext-stroke" d="M1201.2,38.91l-2.7,7.7h-15l-12.1,34.1h-14.3l12-34-15.1-.1a12.54,12.54,0,0,1,9.9-7.7h37.3m5.7-4h-43.6a16.53,16.53,0,0,0-13.1,10.3l-1.8,5.3h5.6l9.5.1-10.1,28.7-1.9,5.3h22.7l.9-2.7,11.1-31.4h15l.9-2.7,2.7-7.7,2.1-5.2Z"/></g></g>
+     </svg>
+
+
+
+
+
+    </div>
+    <div class="content-area">
+        <!-- Inhaltsbereich -->
+
+
+
+
+
+
+
+
+    </div>
+
+
+
+    <div class="footer">
+        <div class="adress">
+            <h3>Fachschaft Elektrotechnik</h3><br>
+            <p>Gußhausstraße 25-27<br>Room CD 01 09 (1st floor)<br>1040 Vienna</p>
+        </div>
+        <div class="contact">
+            <h3>Contact</h3><br>
+            <p>E-Mail: service@fet.at<br>Phone: +43-1-58801 49553<br></p>
+        </div>
+        <div class="servicecontainer">
+        <div class="servicetime">
+            <h3>Service times</h3><br>
+            <p style="text-align: right">Mon to Thur: 9am to 02pm<br>Fri: 9am to 12am<br>
+                <span id="time"></span>
+            </p>
+        </div>
+
+        <div class="servicestatus">
+           <!--  <svg class="servicestatusled">
+                <circle id="servicestatusled" cx="10" cy="15" r="10" style="fill: red" />
+            </svg> -->
+        </div>
+        </div>
+
+
+    </div>
+    <script>
+        var today = new Date();
+        today = today;
+        document.getElementById('time').innerHTML = today;
+
+    </script>
+</body>
+
+</html>

solr/conf/schema.xml

@@ -60,11 +60,17 @@
     <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="text" class="solr.TextField" omitNorms="false">
-      <analyzer>
+      <analyzer type="index">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.PorterStemFilterFactory"/>
+        <filter class="solr.NGramFilterFactory" minGramSize="2" maxGramSize="30"/>
+        <filter class="solr.TrimFilterFactory" />
+        <filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="30"/>
+      </analyzer>
+      <analyzer type="query">
+	<tokenizer class="solr.WhitespaceTokenizerFactory"/>
+	<filter class="solr.LowerCaseFilterFactory"/>
+	<filter class="solr.TrimFilterFactory" />
       </analyzer>
     </fieldType>
     <!-- *** This fieldType is used by Sunspot! *** -->

spec/controllers/fetprofiles_controller_spec.rb

@@ -1,160 +1,185 @@
 require 'spec_helper'
 
-# This spec was generated by rspec-rails when you ran the scaffold generator.
+describe FetprofilesController, :type => :controller  do
-# It demonstrates how one might use RSpec to specify the controller code that
+  let(:valid_update_attributes) { {"vorname"=>"Neuer Vorname"}  }
-# was generated by Rails when you ran the scaffold generator.
+  #  let(:valid_session) { {locale: :de} }
-#
-# It assumes that the implementation code is generated by the rails scaffold
-# generator.  If you are using any extension libraries to generate different
-# controller code, this generated spec may or may not pass.
-#
-# It only uses APIs available in rails and/or rspec-rails.  There are a number
-# of tools you can use to make these specs even more expressive, but we're
-# sticking to rails and rspec-rails APIs to keep things simple and stable.
-#
-# Compared to earlier versions of this generator, there is very limited use of
-# stubs and message expectations in this spec.  Stubs are only used when there
-# is no simpler way to get a handle on the object needed for the example.
-# Message expectations are only used when there is no simpler way to specify
-# that an instance is receiving a specific message.
 
-describe FetprofilesController do
+  def self.create_fetprofile
+    before(:each) do
+      @fetprofile = FactoryGirl.create(:fetprofile)    
+    end
+  end
+  def self.create_active_fetprofile
+    before(:each) do
+      @fetprofile = FactoryGirl.create(:fetprofile, active: true)    
+    end
+  end
 
-  # This should return the minimal set of attributes required to create a valid
+  let(:object_variable) {:fetprofile}    
-  # Fetprofile. As you add validations to Fetprofile, be sure to
+  let(:assigned_object_variable) {@fetprofile}
-  # adjust the attributes here as well.
+  let(:object_class) {Fetprofile}
-  let(:valid_attributes) { { "vorname" => "MyString" } }
-
-  # This should return the minimal set of values that should be in the session
-  # in order to pass any filters (e.g. authentication) defined in
-  # FetprofilesController. Be sure to keep this updated too.
-  let(:valid_session) { {} }
 
   describe "GET index" do
-    it "assigns all fetprofiles as @fetprofiles" do
+    create_active_fetprofile
-      fetprofile = Fetprofile.create! valid_attributes
+    subject(:action) {  get :index, {} }
-      get :index, {}, valid_session
+    let(:object_variable) {:fetprofiles}    
-      assigns(:fetprofiles).should eq([fetprofile])
+    let(:assigned_object_variable) {[@fetprofile]}
-    end
+    it_behaves_like "it is success"
+    it_behaves_like "it assigns object"  
   end
 
   describe "GET show" do
-    it "assigns the requested fetprofile as @fetprofile" do
+    create_fetprofile
-      fetprofile = Fetprofile.create! valid_attributes
+    subject(:action) { get :show, {:id => @fetprofile.to_param}}
-      get :show, {:id => fetprofile.to_param}, valid_session
+    it_behaves_like "it is success"
-      assigns(:fetprofile).should eq(fetprofile)
+    it_behaves_like "it assigns object"
-    end
+      it "renders the 'show' template" do
+        expect(action).to render_template("show")
+      end
+      it "assigns memberships" do
+        action
+        expect(assigns(:memberships)).to be_a(ActiveRecord::Relation)
+      end
+
   end
 
   describe "GET new" do
-    it "assigns a new fetprofile as @fetprofile" do
+    subject(:action) { get :new, {}}
-      get :new, {}, valid_session
+    describe "with fetuser" do
-      assigns(:fetprofile).should be_a_new(Fetprofile)
+      login_fet_user
+      it_behaves_like "it assigns new object"
+      it_behaves_like "it is success"  
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+
   end
 
   describe "GET edit" do
+
+    subject(:action) {get :edit, :id=>@fetprofile.to_param}
+    login_fet_user
+    create_fetprofile
+    it_behaves_like "it is success"
+    it_behaves_like "it assigns object"
+      it "assigns memberships" do
+        action
+        expect(assigns(:memberships)).to be_a(ActiveRecord::Relation)
+      end
+
     it "assigns the requested fetprofile as @fetprofile" do
-      fetprofile = Fetprofile.create! valid_attributes
+      expect{action}.to change {assigns(:fetprofile)}.to(@fetprofile)
-      get :edit, {:id => fetprofile.to_param}, valid_session
+ #     expect(assigns(:fetprofile)).to eq(@fetprofile)
-      assigns(:fetprofile).should eq(fetprofile)
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+    
   end
 
   describe "POST create" do
+    subject(:action){post :create, {:fetprofile => FactoryGirl.attributes_for(:fetprofile),:format=>:html}}
+
+    login_fet_user
     describe "with valid params" do
+
+      it "has a 302 status code" do
+        expect(action.status).to eq(302)
+      end      
       it "creates a new Fetprofile" do
-        expect {
+        expect{action}.to change(Fetprofile, :count).by(1)
-          post :create, {:fetprofile => valid_attributes}, valid_session
-        }.to change(Fetprofile, :count).by(1)
       end
       
-      it "assigns a newly created fetprofile as @fetprofile" do
+      it_behaves_like "it assigns persisted object"
-        post :create, {:fetprofile => valid_attributes}, valid_session
+
-        assigns(:fetprofile).should be_a(Fetprofile)
+      it "assigns memberships" do
-        assigns(:fetprofile).should be_persisted
+        action
+        expect(assigns(:memberships)).to be_a(ActiveRecord::Relation)
       end
 
       it "redirects to the created fetprofile" do
-        post :create, {:fetprofile => valid_attributes}, valid_session
+        expect(action).to redirect_to assigns(:fetprofile)
-        response.should redirect_to(Fetprofile.last)
       end
     end
 
     describe "with invalid params" do
-      it "assigns a newly created but unsaved fetprofile as @fetprofile" do
+      has_invalid_params
-        # Trigger the behavior that occurs when invalid params are submitted
+      it "assigns memberships" do
-        Fetprofile.any_instance.stub(:save).and_return(false)
+        action
-        post :create, {:fetprofile => { "vorname" => "invalid value" }}, valid_session
+        expect(assigns(:memberships)).to be_a(ActiveRecord::Relation)
-        assigns(:fetprofile).should be_a_new(Fetprofile)
       end
 
+      it "assigns a newly created but unsaved fetprofile as @fetprofile" do
+        action
+        assigns(:fetprofile).should be_a_new(Fetprofile)
+        expect(assigns(:fetprofile)).not_to be_persisted
+      end
       it "re-renders the 'new' template" do
-        # Trigger the behavior that occurs when invalid params are submitted
+        expect(action).to render_template("new")
-        Fetprofile.any_instance.stub(:save).and_return(false)
-        post :create, {:fetprofile => { "vorname" => "invalid value" }}, valid_session
-        response.should render_template("new")
       end
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+
   end
 
   describe "PUT update" do
-    describe "with valid params" do
+    let(:action) { put :update, {:id => @fetprofile.to_param, :fetprofile => {"vorname"=>"neuerName"}} }
-      it "updates the requested fetprofile" do
-        fetprofile = Fetprofile.create! valid_attributes
-        # Assuming there are no other fetprofiles in the database, this
-        # specifies that the Fetprofile created on the previous line
-        # receives the :update_attributes message with whatever params are
-        # submitted in the request.
-        Fetprofile.any_instance.should_receive(:update_attributes).with({ "vorname" => "MyString" })
-        put :update, {:id => fetprofile.to_param, :fetprofile => { "vorname" => "MyString" }}, valid_session
-      end
     
-      it "assigns the requested fetprofile as @fetprofile" do
+    create_fetprofile
-        fetprofile = Fetprofile.create! valid_attributes
+    login_fet_user
-        put :update, {:id => fetprofile.to_param, :fetprofile => valid_attributes}, valid_session
+
-        assigns(:fetprofile).should eq(fetprofile)
+    describe "with valid params" do
+      it_behaves_like "it assigns object"
+
+      it "updates the requested fetprofile" do
+       expect { action }.to change{Fetprofile.find(@fetprofile.id).vorname}.to("neuerName")
       end
+      it_behaves_like "it assigns persisted object"
 
       it "redirects to the fetprofile" do
-        fetprofile = Fetprofile.create! valid_attributes
+        expect(action).to redirect_to(@fetprofile)
-        put :update, {:id => fetprofile.to_param, :fetprofile => valid_attributes}, valid_session
-        response.should redirect_to(fetprofile)
       end
     end
 
     describe "with invalid params" do
-      it "assigns the fetprofile as @fetprofile" do
+      has_invalid_params
-        fetprofile = Fetprofile.create! valid_attributes
+      it_behaves_like "it assigns object"
-        # Trigger the behavior that occurs when invalid params are submitted
-        Fetprofile.any_instance.stub(:save).and_return(false)
-        put :update, {:id => fetprofile.to_param, :fetprofile => { "vorname" => "invalid value" }}, valid_session
-        assigns(:fetprofile).should eq(fetprofile)
-      end
-
       it "re-renders the 'edit' template" do
-        fetprofile = Fetprofile.create! valid_attributes
+        expect(action).to render_template("edit")
-        # Trigger the behavior that occurs when invalid params are submitted
-        Fetprofile.any_instance.stub(:save).and_return(false)
-        put :update, {:id => fetprofile.to_param, :fetprofile => { "vorname" => "invalid value" }}, valid_session
-        response.should render_template("edit")
       end
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
   end
 
   describe "DELETE destroy" do
+    login_fet_user
+    create_fetprofile
+    subject(:action) { delete :destroy, {:id => @fetprofile.to_param}}
+
     it "destroys the requested fetprofile" do
-      fetprofile = Fetprofile.create! valid_attributes
       expect {
-        delete :destroy, {:id => fetprofile.to_param}, valid_session
+       action
       }.to change(Fetprofile, :count).by(-1)
     end
 
     it "redirects to the fetprofiles list" do
-      fetprofile = Fetprofile.create! valid_attributes
+      action
-      delete :destroy, {:id => fetprofile.to_param}, valid_session
       response.should redirect_to(fetprofiles_url)
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+
   end
 
 end

spec/controllers/gremien_controller_spec.rb

@@ -1,160 +1,179 @@
 require 'spec_helper'
 
-# This spec was generated by rspec-rails when you ran the scaffold generator.
+describe GremienController, :type => :controller  do
-# It demonstrates how one might use RSpec to specify the controller code that
+  let(:valid_update_attributes) { {"name"=>"NeuesGremium"}  }
-# was generated by Rails when you ran the scaffold generator.
+  #  let(:valid_session) { {locale: :de} }
-#
-# It assumes that the implementation code is generated by the rails scaffold
-# generator.  If you are using any extension libraries to generate different
-# controller code, this generated spec may or may not pass.
-#
-# It only uses APIs available in rails and/or rspec-rails.  There are a number
-# of tools you can use to make these specs even more expressive, but we're
-# sticking to rails and rspec-rails APIs to keep things simple and stable.
-#
-# Compared to earlier versions of this generator, there is very limited use of
-# stubs and message expectations in this spec.  Stubs are only used when there
-# is no simpler way to get a handle on the object needed for the example.
-# Message expectations are only used when there is no simpler way to specify
-# that an instance is receiving a specific message.
 
-describe GremienController do
+  def self.create_gremium
+    before(:each) do
+      @gremium = FactoryGirl.create(:gremium)    
+    end
+  end
+#  def self.create_active_gremium
+#    before(:each) do
+#      @gremium = FactoryGirl.create(:gremium, active: true)    
+#    end
+#  end
 
-  # This should return the minimal set of attributes required to create a valid
+  let(:object_variable) {:gremium}    
-  # Gremium. As you add validations to Gremium, be sure to
+  let(:assigned_object_variable) {@gremium}
-  # adjust the attributes here as well.
+  let(:object_class) {Gremium}
-  let(:valid_attributes) { { "name" => "MyString" } }
-
-  # This should return the minimal set of values that should be in the session
-  # in order to pass any filters (e.g. authentication) defined in
-  # GremienController. Be sure to keep this updated too.
-  let(:valid_session) { {} }
 
   describe "GET index" do
-    it "assigns all gremien as @gremien" do
+    create_gremium
-      gremium = Gremium.create! valid_attributes
+    subject(:action) {  get :index, {} }
-      get :index, {}, valid_session
+    let(:object_variable) {:gremien}    
-      assigns(:gremien).should eq([gremium])
+    let(:assigned_object_variable) {[@gremium]}
-    end
+    it_behaves_like "it is success"
+    it_behaves_like "it assigns object"  
   end
 
   describe "GET show" do
-    it "assigns the requested gremium as @gremium" do
+    create_gremium
-      gremium = Gremium.create! valid_attributes
+    subject(:action) { get :show, {:id => @gremium.to_param}}
-      get :show, {:id => gremium.to_param}, valid_session
+    it_behaves_like "it is success"
-      assigns(:gremium).should eq(gremium)
+    it_behaves_like "it assigns object"
-    end
+      it "renders the 'show' template" do
+        expect(action).to render_template("show")
+      end
+      it "assigns memberships" do
+        action
+        expect(assigns(:memberships)).to be_a(ActiveRecord::Relation)
+      end
+
   end
 
   describe "GET new" do
-    it "assigns a new gremium as @gremium" do
+    subject(:action) { get :new, {}}
-      get :new, {}, valid_session
+    describe "with fetuser" do
-      assigns(:gremium).should be_a_new(Gremium)
+      login_fet_user
+      it_behaves_like "it assigns new object"
+      it_behaves_like "it is success"  
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+
   end
 
   describe "GET edit" do
+
+    subject(:action) {get :edit, :id=>@gremium.to_param}
+    login_fet_user
+    create_gremium
+    it_behaves_like "it is success"
+    it_behaves_like "it assigns object"
+      it "assigns memberships" do
+        action
+        expect(assigns(:memberships)).to be_a(ActiveRecord::Relation)
+      end
+
     it "assigns the requested gremium as @gremium" do
-      gremium = Gremium.create! valid_attributes
+      expect{action}.to change {assigns(:gremium)}.to(@gremium)
-      get :edit, {:id => gremium.to_param}, valid_session
+ #     expect(assigns(:gremium)).to eq(@gremium)
-      assigns(:gremium).should eq(gremium)
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+    
   end
 
   describe "POST create" do
+    subject(:action){post :create, {:gremium => FactoryGirl.attributes_for(:gremium),:format=>:html}}
+
+    login_fet_user
     describe "with valid params" do
+
+      it "has a 302 status code" do
+        expect(action.status).to eq(302)
+      end      
       it "creates a new Gremium" do
-        expect {
+        expect{action}.to change(Gremium, :count).by(1)
-          post :create, {:gremium => valid_attributes}, valid_session
-        }.to change(Gremium, :count).by(1)
       end
       
-      it "assigns a newly created gremium as @gremium" do
+      it_behaves_like "it assigns persisted object"
-        post :create, {:gremium => valid_attributes}, valid_session
+
-        assigns(:gremium).should be_a(Gremium)
-        assigns(:gremium).should be_persisted
-      end
 
       it "redirects to the created gremium" do
-        post :create, {:gremium => valid_attributes}, valid_session
+        expect(action).to redirect_to assigns(:gremium)
-        response.should redirect_to(Gremium.last)
       end
     end
 
     describe "with invalid params" do
-      it "assigns a newly created but unsaved gremium as @gremium" do
+      has_invalid_params
-        # Trigger the behavior that occurs when invalid params are submitted
-        Gremium.any_instance.stub(:save).and_return(false)
-        post :create, {:gremium => { "name" => "invalid value" }}, valid_session
-        assigns(:gremium).should be_a_new(Gremium)
-      end
    
+
+      it "assigns a newly created but unsaved gremium as @gremium" do
+        action
+        assigns(:gremium).should be_a_new(Gremium)
+        expect(assigns(:gremium)).not_to be_persisted
+      end
       it "re-renders the 'new' template" do
-        # Trigger the behavior that occurs when invalid params are submitted
+        expect(action).to render_template("new")
-        Gremium.any_instance.stub(:save).and_return(false)
-        post :create, {:gremium => { "name" => "invalid value" }}, valid_session
-        response.should render_template("new")
       end
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+
   end
 
   describe "PUT update" do
-    describe "with valid params" do
+    let(:action) { put :update, {:id => @gremium.to_param, :gremium => {"name"=>"neuerName"}} }
-      it "updates the requested gremium" do
-        gremium = Gremium.create! valid_attributes
-        # Assuming there are no other gremien in the database, this
-        # specifies that the Gremium created on the previous line
-        # receives the :update_attributes message with whatever params are
-        # submitted in the request.
-        Gremium.any_instance.should_receive(:update_attributes).with({ "name" => "MyString" })
-        put :update, {:id => gremium.to_param, :gremium => { "name" => "MyString" }}, valid_session
-      end
     
-      it "assigns the requested gremium as @gremium" do
+    create_gremium
-        gremium = Gremium.create! valid_attributes
+    login_fet_user
-        put :update, {:id => gremium.to_param, :gremium => valid_attributes}, valid_session
+
-        assigns(:gremium).should eq(gremium)
+    describe "with valid params" do
+      it_behaves_like "it assigns object"
+
+      it "updates the requested gremium" do
+       expect { action }.to change{Gremium.find(@gremium.id).name}.to("neuerName")
       end
+      it_behaves_like "it assigns persisted object"
 
       it "redirects to the gremium" do
-        gremium = Gremium.create! valid_attributes
+        expect(action).to redirect_to(@gremium)
-        put :update, {:id => gremium.to_param, :gremium => valid_attributes}, valid_session
-        response.should redirect_to(gremium)
       end
     end
 
     describe "with invalid params" do
-      it "assigns the gremium as @gremium" do
+      has_invalid_params
-        gremium = Gremium.create! valid_attributes
+      it_behaves_like "it assigns object"
-        # Trigger the behavior that occurs when invalid params are submitted
-        Gremium.any_instance.stub(:save).and_return(false)
-        put :update, {:id => gremium.to_param, :gremium => { "name" => "invalid value" }}, valid_session
-        assigns(:gremium).should eq(gremium)
-      end
-
       it "re-renders the 'edit' template" do
-        gremium = Gremium.create! valid_attributes
+        expect(action).to render_template("edit")
-        # Trigger the behavior that occurs when invalid params are submitted
-        Gremium.any_instance.stub(:save).and_return(false)
-        put :update, {:id => gremium.to_param, :gremium => { "name" => "invalid value" }}, valid_session
-        response.should render_template("edit")
       end
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
   end
 
   describe "DELETE destroy" do
+    login_fet_user
+    create_gremium
+    subject(:action) { delete :destroy, {:id => @gremium.to_param}}
+
     it "destroys the requested gremium" do
-      gremium = Gremium.create! valid_attributes
       expect {
-        delete :destroy, {:id => gremium.to_param}, valid_session
+       action
       }.to change(Gremium, :count).by(-1)
     end
 
     it "redirects to the gremien list" do
-      gremium = Gremium.create! valid_attributes
+      action
-      delete :destroy, {:id => gremium.to_param}, valid_session
       response.should redirect_to(gremien_url)
     end
+    describe "without user" do 
+      logout_user
+      it_behaves_like "it is restricted"
+    end 
+
   end
 
 end
+

spec/controllers/shared_examples/basic.rb

@@ -0,0 +1,42 @@
+  shared_examples "it is success" do
+    it "has a 200 status code" do
+      action
+      expect(response.status).to eq(200)
+    end
+    it "is success" do
+      action
+        expect(response).to be_success
+    end
+  end
+  shared_examples "it assigns object" do
+    it "assigns object variable" do 
+      action
+      expect(assigns(object_variable)).to eq(assigned_object_variable)
+    end
+  end
+  shared_examples "it assigns new object" do
+    it "assigns new object" do
+      action
+      expect(assigns(object_variable)).to be_a_new(object_class)
+      expect(assigns(object_variable)).not_to be_persisted
+
+    end
+  end
+  shared_examples "it assigns persisted object" do
+    it "assigns new object" do
+      action
+        expect(assigns(object_variable)).to be_a(object_class)
+        expect(assigns(object_variable)).to be_persisted
+    end
+  end
+
+  shared_examples "it is restricted" do
+    it "is expected to raise error" do
+      bypass_rescue
+      expect { action }.to raise_error(CanCan::AccessDenied)
+    end
+    it "is not success" do
+      action
+      expect(response).not_to be_success
+    end
+  end

spec/factories/attachments.rb

@@ -3,5 +3,7 @@
 FactoryGirl.define do
   factory :attachment do
     name "MyString"
+    datei { Rack::Test::UploadedFile.new(File.join(Rails.root,'public','fetlogo.png'))}
+    flag_titlepic false
   end
 end

spec/factories/beispiele.rb

@@ -2,5 +2,9 @@
 
 FactoryGirl.define do
   factory :beispiel do
+    name "BSP1"
+    desc "sdf"
+    datum Date.today
+    beispieldatei { Rack::Test::UploadedFile.new(File.join(Rails.root,'public','fetlogo.png'))}
   end
 end

spec/factories/fetprofiles.rb

@@ -9,5 +9,23 @@ FactoryGirl.define do
     desc "MyText"
     picture "MyString"
     active false
+    birth_month 4
+    birth_day 2
+    factory :fetprofile2 do 
+      vorname "Sarah"
+      nachname "Nachname2"
+      short "j"
+    end
+    factory :fetprofile3 do 
+      vorname "Thomas"
+      nachname "Mustermann"
+    end
+    factory :fetprofile_withadress do
+      street "some street"
+      plz "1231"
+      city "vienna"
+      telnr "sdf tel nummer"
+      hdynr "sdf hdy nummer"
+    end
   end
 end

spec/factories/gremien.rb

@@ -1,9 +1,11 @@
+# -*- coding: utf-8 -*-
+
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
 FactoryGirl.define do
   factory :gremium do
-    name "MyString"
+    name "Kommission"
-    desc "MyText"
+    desc "Das ist eine Kommission die sich mit irgendwas beschäftigt"
-    typ "MyString"
+    typ 1
-  end
+   end
 end

spec/factories/lvas.rb

@@ -2,5 +2,13 @@
 
 FactoryGirl.define do
   factory :lva do
+    name "Vorlesung 1"
+    desc "Das ist eine Vorlesung"
+    lvanr "001.002"
+    ects 3
+    stunden 2
+    pruefungsinformation "sdf"
+    lernaufwand "sdf"
+    typ  'VO'
   end
 end