diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 4005f4b..bcf42d0 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -24,7 +24,7 @@ body,html div.header {display: block; -background: url('/assets/fet_logo_3.png') rgb(129,97,51) no-repeat; +background: url('/assets/fet_logo_3.png') rgb(205,204,226) no-repeat; background-position:15px center; height:60px; padding-left:160px; @@ -32,4 +32,9 @@ padding-top:0px; overflow:hidden } +#menudiv +{ + + width:100%; +} diff --git a/app/controllers/config_controller.rb b/app/controllers/config_controller.rb index f4cd32d..d4dc042 100644 --- a/app/controllers/config_controller.rb +++ b/app/controllers/config_controller.rb @@ -5,7 +5,7 @@ class ConfigController < ApplicationController def get_git_update g = Git.open(".") - flash[:notice] =g.status + flash[:notice] ="Test" # flash[:notice] =g.remote("github").fetch redirect_to config_url diff --git a/app/models/ability.rb b/app/models/ability.rb index d478dba..db14a6f 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -29,7 +29,7 @@ class Ability # Remove this line in production environment and for testing user management can :manage, :all - # Rechteverwaltung für Studien Modul + # Rechteverwaltung f�r Studien Modul can :read, Modulgruppe if user.has_role? "newsadmin" can :manage, Modulgruppe @@ -37,5 +37,9 @@ class Ability can :addmoderator, Rubrik end + + # Rechteverwaltung fuer Neuigkeiten + can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik) + end end diff --git a/app/views/config/index.html.erb b/app/views/config/index.html.erb index 0b8f2c9..0275e76 100644 --- a/app/views/config/index.html.erb +++ b/app/views/config/index.html.erb @@ -1,4 +1,9 @@ -