diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index a2c8f7f..9dd7765 100755 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -15,45 +15,65 @@ */ +// Colorshema #0A64A4 +$bodyBackground: #FFFFFF; +$navbarBackground: #FFCE40; +$navbarBackgroundHighlight:#FFDB73; +$navbarLinkBackgroundHover:#FFBE00; +$infoBackground:#65A5D1; +$infoText:#03406A; $linkColor: #03006E; @import 'bootstrap'; @import 'bootstrap-responsive'; @import 'bootstrap/image-gallery'; -h1 -{font-size: 23px} -h2 -{font-size: 19px} -body,html -{padding:0;margin:0;} - -div.header -{display: block; -background: url('/assets/fet_logo_2.png') rgb(235,235,235) no-repeat; -background-position:15px center; -border-bottom:1px solid black; -height:60px; -padding-left:160px; -padding-top:0px; -overflow:hidden; -margin-bottom: 20px +h1 { + font-size: 23px } -#menudiv -{ - - width:100%; +h2 { + font-size: 19px } +body,html { + padding:0; + margin:0; + +} +a:hover { + text-decoration:none; +} + +div.header { + display: block; + background: url('/assets/fet_logo_2.png') no-repeat; + background-color: #0A64A4; + background-position:15px center; + border-bottom:1px solid black; + height:60px; + color:#CFCFCF; + padding-left:160px; + padding-top:0px; + overflow:hidden; + margin-bottom: 20px +} + +#menudiv { + width:100%; +} + .navbar .nav li { -min-width:60%; - + min-width:60%; } .navbar .nav .divider { -border-style: solid; -border-width: 1px 0px 0px 0px; -border-color: grey; -min-width: 100%; + border-style: solid; + border-width: 1px 0px 0px 0px; + border-color: grey; + min-width: 100%; +} + +#contentdiv{ + background: #FFFFFF } diff --git a/app/assets/stylesheets/neuigkeiten.css.scss b/app/assets/stylesheets/neuigkeiten.css.scss index 4a995b3..9324374 100755 --- a/app/assets/stylesheets/neuigkeiten.css.scss +++ b/app/assets/stylesheets/neuigkeiten.css.scss @@ -1,3 +1,11 @@ // Place all the styles related to the neuigkeiten controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + + +div .neuigkeit_block { +border: 1px solid #ccc; +background: white; +padding:10px; + +} \ No newline at end of file diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index fb13622..d14f3aa 100755 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -1,6 +1,4 @@ body { - background-color: #fff; - color: #333; font-family: verdana, arial, helvetica, sans-serif; font-size: 13px; line-height: 18px; diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index bee4934..05e0941 100755 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -6,6 +6,8 @@ class NeuigkeitenController < ApplicationController @neuigkeit = Neuigkeit.find(params[:id]) if params[:verwalten] @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('neuigkeit.publish'),:path => publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>"Sure?" } if can? :publish, @neuigkeit + @toolbar_elements << {:hicon=>'icon-minus', :text=> I18n.t('neuigkeit.unpublish'),:path => unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>"Sure?" } if can? :unpublish, @neuigkeit + @toolbar_elements << {:text=>I18n.t('common.edit'),:path=>edit_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:icon=>:pencil} if can? :edit, @neuigkeit @toolbar_elements << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :method=> :delete,:confirm=>"Sure?" } if can? :delete, @neuigkeit @@ -20,7 +22,15 @@ class NeuigkeitenController < ApplicationController @rubrik=Rubrik.find(params[:rubrik_id]) unless params[:rubrik_id].nil? @neuigkeit.rubrik=@rubrik unless @rubrik.nil? end - + def unpublish + @neuigkeit = Neuigkeit.find(params[:id]) + @neuigkeit.reverse_publish + @neuigkeit.save + if params[:verwalten] + redirect_to verwalten_rubrik_path(@neuigkeit.rubrik) + end + redirect_to rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit) + end def publish @neuigkeit = Neuigkeit.find(params[:id]) @neuigkeit.publish diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 985fcda..a307934 100755 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -12,7 +12,12 @@ Fehlermeldungen auf GitHub melden. Folgene Features sind schon soweit, dass Bugreports und Feature Requests sinnvoll sind: