From 12f426235f2e0367b64ca571d632056be010da6f Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Fri, 6 Sep 2013 00:33:12 +0200 Subject: [PATCH 1/3] design-tests1 --- app/assets/stylesheets/application.css.scss | 74 +++++++++++++-------- app/assets/stylesheets/neuigkeiten.css.scss | 8 +++ app/assets/stylesheets/scaffolds.css.scss | 2 - app/views/layouts/application.html.erb | 4 +- app/views/layouts/menu.html.erb | 2 +- app/views/neuigkeiten/_neuigkeit.html.erb | 25 ++++--- 6 files changed, 72 insertions(+), 43 deletions(-) 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/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 774d3c9..6746f61 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -15,7 +15,7 @@ -
+

Fachschaft Elektrotechnik

@@ -24,7 +24,7 @@
-
+
<%= yield %>
diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb index 7b93ae5..b6e6be8 100755 --- a/app/views/layouts/menu.html.erb +++ b/app/views/layouts/menu.html.erb @@ -1,7 +1,7 @@
- <%= t 'home.mtitle'%> + diff --git a/app/views/neuigkeiten/_neuigkeit.html.erb b/app/views/neuigkeiten/_neuigkeit.html.erb index 23637fd..bd11547 100755 --- a/app/views/neuigkeiten/_neuigkeit.html.erb +++ b/app/views/neuigkeiten/_neuigkeit.html.erb @@ -1,15 +1,18 @@ <%= link_to [neuigkeit.rubrik,neuigkeit] do %> -
-
-


<%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %>

-
-
<%= neuigkeit.rubrik.name %> - <%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %>
-

<%= neuigkeit.title%>

- <%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%> -

-
+
+
+


<%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %> +

+
+
+
+ <%= neuigkeit.rubrik.name %> + <%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %> +
+

<%= neuigkeit.title%>

+ <%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%> +
- +
<% end %> From ca60c3ef1bfe5cb774e7a9e92be16c6c266c0c9a Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Fri, 6 Sep 2013 00:33:30 +0200 Subject: [PATCH 2/3] neuigkeit unpublish --- app/controllers/neuigkeiten_controller.rb | 12 +++++++++++- config/routes.rb | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) 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/config/routes.rb b/config/routes.rb index 7d69e74..1bf686b 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -71,6 +71,7 @@ resources :neuigkeiten, :except => [:index] do member do get 'publish' + get 'unpublish' end end end From 41e54281bdbbcd94cdd46cc2cedb5b3b0f49f293 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Fri, 6 Sep 2013 00:33:46 +0200 Subject: [PATCH 3/3] infotext --- app/views/home/index.html.erb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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:
  • Studien/Beispielsammlung
    -Während dem September werden hier nur Bugfixes und kleine Änderungen passieren. Feature Requests werden erst ab Oktober wieder bearbeitet.
    • +
  • Neuigkeiten
    • +
  • Informationen
    • +
  • Mitarbeiter
    • +
  • Foto - Galerie
    • +
  • Kalender
    • +
alle anderen sind nur zur Voransicht. Bezüglich Design und Steuerung sind Vorschläge erwünscht.