From 2f741d5893657f2978792b8763e54d123cf18b45 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 1 Apr 2019 06:47:49 +0200 Subject: [PATCH] fixes for design --- app/assets/javascripts/application.js | 2 +- ...tion.css.scss => application.bak.css.scss} | 12 +- .../themes/2003/application.css.scss | 106 --------------- .../themes/2003/bootstrap-responsive.scss | 5 - .../stylesheets/themes/2003/test.css.scss | 4 - .../themes/blue1/application.css.scss | 123 ----------------- .../themes/blue1/linkboxes.css.scss | 61 --------- .../themes/darkblue/application.css.scss | 126 ------------------ .../themes/white_1/application.css.scss | 91 ------------- app/controllers/themengruppen_controller.rb | 2 +- app/models/themengruppe.rb | 3 +- .../assets/stylesheets/application.css.scss | 50 ++++--- .../blue2/assets/stylesheets/archiv/alt.bak | 49 +++++++ app/themes/blue2/views/home/index.html.erb | 67 ++++++++++ app/themes/blue2/views/layouts/blue2.html.erb | 45 +++---- app/themes/blue2/views/layouts/menu.html.erb | 88 ++++++++++++ app/views/calendars/_calentries.html.erb | 5 +- app/views/devise/sessions/new.html.erb | 4 +- app/views/layouts/_pretty_toolbar.html.erb | 1 + app/views/layouts/menu.html.erb | 23 ++-- app/views/rubriken/index.html.erb | 14 +- app/views/rubriken/show.html.erb | 12 +- config/environments/development.rb | 2 +- 23 files changed, 294 insertions(+), 601 deletions(-) rename app/assets/stylesheets/{application.css.scss => application.bak.css.scss} (93%) delete mode 100755 app/assets/stylesheets/themes/2003/application.css.scss delete mode 100644 app/assets/stylesheets/themes/2003/bootstrap-responsive.scss delete mode 100644 app/assets/stylesheets/themes/2003/test.css.scss delete mode 100755 app/assets/stylesheets/themes/blue1/application.css.scss delete mode 100644 app/assets/stylesheets/themes/blue1/linkboxes.css.scss delete mode 100755 app/assets/stylesheets/themes/darkblue/application.css.scss delete mode 100644 app/assets/stylesheets/themes/white_1/application.css.scss create mode 100644 app/themes/blue2/assets/stylesheets/archiv/alt.bak create mode 100755 app/themes/blue2/views/home/index.html.erb create mode 100644 app/themes/blue2/views/layouts/menu.html.erb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 205d208..2944069 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,7 @@ // //= require jquery //= require jquery_ujs -//= require jquery.ui.all +//= require jquery-ui/core // require jquery.ui.draggable // require jquery.ui.sortable // require jquery.ui.gallery diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.bak.css.scss similarity index 93% rename from app/assets/stylesheets/application.css.scss rename to app/assets/stylesheets/application.bak.css.scss index c150411..ce196f4 100755 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.bak.css.scss @@ -14,10 +14,10 @@ *= require blueimp-gallery-all *= require jquery.fileupload-ui *= require jquery.datetimepicker - *= require jquery.ui.dialog - *= require jquery.ui.autocomplete - *= require jquery.ui.progressbar - *= require jquery.ui.tabs + *= require jquery-ui/dialog + *= require jquery-ui/autocomplete + *= require jquery-ui/progressbar + *= require jquery-ui/tabs * require 'bootstrap' * require 'neuigkeiten' */ @@ -73,7 +73,7 @@ $infoText:#03406A; $sansFontFamily: Helvetica, Arial; @import 'bootstrap'; -@import 'bootstrap-responsive'; +//@import 'bootstrap-responsive'; @import 'bootstrap/image-gallery'; @import 'font-awesome'; @import 'neuigkeiten'; @@ -120,4 +120,4 @@ $box-background: white; @import 'layout'; @import 'linkboxes'; @import 'calendars'; -@import 'formtastic-bootstrap' \ No newline at end of file +@import 'formtastic-bootstrap' diff --git a/app/assets/stylesheets/themes/2003/application.css.scss b/app/assets/stylesheets/themes/2003/application.css.scss deleted file mode 100755 index 3583ed2..0000000 --- a/app/assets/stylesheets/themes/2003/application.css.scss +++ /dev/null @@ -1,106 +0,0 @@ - -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * 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. - * - * 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. - * - *= require_self - * require_tree . - *= require jquery.fileupload-ui - * require 'bootstrap' - - * require 'neuigkeiten' - */ -// Colorshema #0A64A4 -$color_schema_1: #006599; -$color_schema_2: #630CE8; -$color_schema_3: #FF0021; -$color_schema_4: #E8820C; -$color_schema_5: #FFF30D; - -$color_schema_1_dark: darken($color_schema_1, 10%); -$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: #7070a0; -$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: FFDB73; -$color_cont_light:FFDB73; -$linkColor: $color_prim_vdark; -$white: #FFFFFF; - -$bodyBackground: #EEE; - - - - -$navbarBackground: $color_prim; -$navbarText: black; -$navbarLinkColor: $color_prim_vdark; -$navbarLinkColorHover: black; -$dropdownLinkColor: black; -$navbar-default-brand-color: black; -$navbarBrandColor:black; - - -$navbarBackgroundHighlight: $color_prim; -//$navbarBackgroundHighlight:#FFFFFF; - -$navbarLinkBackgroundHover:#FFBE00; -$navbarLinkBackgroundHover: darken($navbarBackground,10%); - - -$infoBackground:#65A5D1; -$infoText:#03406A; -$sansFontFamily: Helvetica, Arial; - -@import 'bootstrap'; -@import 'bootstrap-responsive'; -@import 'bootstrap/image-gallery'; - -@import 'neuigkeiten'; -@import 'font-awesome'; - -div.header { - display: block; -// background: url('../../../../header1.png') no-repeat; -// background-color:white;// $color_prim; - background-position: right; - border-bottom:1px solid black; - float:left; - color:#000; - padding-left:87px; - padding-top:0px; -// overflow:hidden; - margin-bottom: 0 px -} -div.header h1 { - padding:0; -margin:4px; -font-size:20px; -line-height:32px; -} - -div.headerrow { -background: $color_prim -} - $contentdiv-background:none; -$navbar-li-minwidth: 0; - -$box-border: lightgray solid 1px; -$box-border-radius:8px; -$box-background: white; -@import 'layout'; -@import 'calendars'; \ No newline at end of file diff --git a/app/assets/stylesheets/themes/2003/bootstrap-responsive.scss b/app/assets/stylesheets/themes/2003/bootstrap-responsive.scss deleted file mode 100644 index f2950bd..0000000 --- a/app/assets/stylesheets/themes/2003/bootstrap-responsive.scss +++ /dev/null @@ -1,5 +0,0 @@ -@import "bootstrap/responsive"; -@media (max-width: 979px){ -.earlymax { -min-width: 100%; -}} diff --git a/app/assets/stylesheets/themes/2003/test.css.scss b/app/assets/stylesheets/themes/2003/test.css.scss deleted file mode 100644 index 7e52313..0000000 --- a/app/assets/stylesheets/themes/2003/test.css.scss +++ /dev/null @@ -1,4 +0,0 @@ -#content -{ - background:red; -} \ No newline at end of file diff --git a/app/assets/stylesheets/themes/blue1/application.css.scss b/app/assets/stylesheets/themes/blue1/application.css.scss deleted file mode 100755 index c150411..0000000 --- a/app/assets/stylesheets/themes/blue1/application.css.scss +++ /dev/null @@ -1,123 +0,0 @@ - -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * 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. - * - * 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. - * - *= require_self - * require_tree . - *= require blueimp-gallery-all - *= require jquery.fileupload-ui - *= 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; -$color_schema_2: #630CE8; -$color_schema_3: #FF0021; -$color_schema_4: #E8820C; -$color_schema_5: #FFF30D; - -$color_schema_1_dark: darken($color_schema_1, 10%); -$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: #EEE; - - - - -$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: darken($navbarBackground,10%); - - -$infoBackground:#65A5D1; -$infoText:#03406A; -$sansFontFamily: Helvetica, Arial; - -@import 'bootstrap'; -@import 'bootstrap-responsive'; -@import 'bootstrap/image-gallery'; -@import 'font-awesome'; -@import 'neuigkeiten'; -@import 'themengruppen'; - -div.header { - display: block; -// background: url('../../../../header1.png') no-repeat; -// background-color:white;// $color_prim; - // background-position: right; - vertical-align:middle; - float:left; - color:#000; - padding-top:0px; - overflow:visible; - height:45px; - margin-bottom: 0 px -} -div.header h1 { - padding:0; - margin:4px; - font-size:20px; - line-height:32px; -} -div.header img { -//top:2px; -//position:relative; -} -div.navbar { -border-bottom: $color_prim solid 3px; -} -div.headerrow { -} - -$contentdiv-background:none; -$navbar-li-minwidth: 0; - - - -$box-border: #ccc solid 1px; -$box-border-radius:0px; -$box-background: white; - -@import 'layout'; -@import 'linkboxes'; -@import 'calendars'; -@import 'formtastic-bootstrap' \ No newline at end of file diff --git a/app/assets/stylesheets/themes/blue1/linkboxes.css.scss b/app/assets/stylesheets/themes/blue1/linkboxes.css.scss deleted file mode 100644 index 15bb687..0000000 --- a/app/assets/stylesheets/themes/blue1/linkboxes.css.scss +++ /dev/null @@ -1,61 +0,0 @@ -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; - -} - diff --git a/app/assets/stylesheets/themes/darkblue/application.css.scss b/app/assets/stylesheets/themes/darkblue/application.css.scss deleted file mode 100755 index e623f4e..0000000 --- a/app/assets/stylesheets/themes/darkblue/application.css.scss +++ /dev/null @@ -1,126 +0,0 @@ - -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * 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. - * - * 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. - * - *= require_self - * require_tree . - *= require jquery.fileupload-ui - * require 'bootstrap' - - * require 'neuigkeiten' - */ -$color_schema_1: #006599; -$color_schema_2: #630CE8; -$color_schema_3: #FF0021; -$color_schema_4: #E8820C; -$color_schema_5: #FFF30D; - -$color_schema_1_dark: darken($color_schema_1, 10%); -$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%); - -// Colorshema #0A64A4 -$color_prim: #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: FFDB73; -$color_cont_light:FFDB73; -$linkColor: $color_prim; -$white: #FFFFFF; - -$bodyBackground: #EEE; - - - - -$navbarBackground: $color_prim; -$navbarText: $white; -$navbarLinkColor: $white; -$navbarLinkColorHover: white; -$dropdownLinkColor: black; -$navbar-default-brand-color: black; -$navbarBrandColor:black; - - -$navbarBackgroundHighlight: $color_prim; -//$navbarBackgroundHighlight:#FFFFFF; - -$navbarLinkBackgroundHover:#FFBE00; -$navbarLinkBackgroundHover: darken($navbarBackground,10%); - - -$infoBackground:#65A5D1; -$infoText:#03406A; - -@font-face { -font-family: 'ayuma2yk'; -src:font-url('Ayuma2yk.ttf');} -@font-face { - font-family: 'cmunrm'; - src: font-url('cmunrm.eot'); - src: font-url('cmunrm.eot') format('embedded-opentype'), - font-url('cmunrm.woff') format('woff'), - font-url('cmunrm.ttf') format('truetype'), - font-url('cmunrm.svg') format('svg'); - font-weight: normal; - font-style: normal; -} - - - -$sansFontFamily: cmunrm, Helvetica, Arial; - -@import 'bootstrap'; -@import 'bootstrap-responsive'; -@import 'bootstrap/image-gallery'; -@import 'font-awesome'; -@import 'neuigkeiten'; -@import 'fetlogo'; -#menudiv { - -} - -div.header { - display: block; -// background: url('../../../../header1.png') no-repeat; -// background-color:white;// $color_prim; - background-position: right; - font-family: ayuma2yk; - // border-bottom:1px solid black; - float:left; - color:#000; - padding-left:87px; - padding-top:0px; -// overflow:hidden; - margin-bottom: 0 px -} -div.header h1 { - padding:0; -margin:4px; -font-size:20px; -line-height:32px; -} - -div.headerrow { -background: $color_prim -} - $contentdiv-background:none; -$navbar-li-minwidth: 0; - -$box-border: lightgray solid 1px; -$box-border-radius:0px; -$box-background: white; -@import 'layout'; -@import 'calendars'; diff --git a/app/assets/stylesheets/themes/white_1/application.css.scss b/app/assets/stylesheets/themes/white_1/application.css.scss deleted file mode 100644 index 22de038..0000000 --- a/app/assets/stylesheets/themes/white_1/application.css.scss +++ /dev/null @@ -1,91 +0,0 @@ - -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * 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. - * - * 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. - * - *= require_self - * require_tree . - *= require jquery.fileupload-ui - * require 'bootstrap' - - * require 'neuigkeiten' - */ - - -$color_schema_1: #006599; -$color_schema_2: #630CE8; -$color_schema_3: #FF0021; -$color_schema_4: #E8820C; -$color_schema_5: #FFF30D; - -$color_schema_1_dark: darken($color_schema_1, 30%); -$color_schema_2_dark: darken($color_schema_2, 30%); -$color_schema_3_dark: darken($color_schema_3, 30%); -$color_schema_4_dark: darken($color_schema_4, 30%); -$color_schema_5_dark: darken($color_schema_5, 30%); - - -$color_prim: #0A64A4; -$color_prim_light: #0B65A5; -$color_prim_vlight: #2B85C5; -$color_cont: FFDB73; -$color_cont_light:FFDB73; -$linkColor: #03006E; -$white: #FFFFFF; - -$bodyBackground: $white; -$navbarBackground: $color_cont; -$navbarBackground: #FFFFFF; - -$navbarBackgroundHighlight:lighten($navbarBackground,30%); -//$navbarBackgroundHighlight:#FFFFFF; - -$navbarLinkBackgroundHover:#FFBE00; -$navbarLinkBackgroundHover: lighten(#cccccc,10%); -$infoBackground:#65A5D1; -$infoText:#03406A; -$sansFontFamily: Helvetica, Arial; - -@import 'bootstrap'; -@import 'bootstrap-responsive'; -@import 'bootstrap/image-gallery'; -@import 'font-awesome'; -@import 'neuigkeiten'; - -div.header { - display: block; - // background: url('/header1.png') no-repeat; - background-color: #FFF; - background-position: right; - border-bottom:1px solid black; - height:41px; - color:#000; - padding-left:87px; - padding-top:0px; - overflow:hidden; - margin-bottom: 20px -} -div.header h1 { -padding:0; -margin:4px; -font-size:20px; -line-height:32px; -} -div.headerrow { -background: $white -} -$navbar-li-minwidth: 100%; - -$contentdiv-background:none; -$box-border: lightgray solid 1px; -$box-border-radius:8px; -$box-background: white; -@import 'layout'; -@import 'calendars'; -@import 'tinymce'; \ No newline at end of file diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb index f84c9de..83ef0ad 100644 --- a/app/controllers/themengruppen_controller.rb +++ b/app/controllers/themengruppen_controller.rb @@ -3,7 +3,7 @@ class ThemengruppenController < ApplicationController # GET /themengruppen.json load_and_authorize_resource def index - @themengruppen = Themengruppe.accessible_by(current_ability, :show).public.includes(:themen) + @themengruppen = Themengruppe.accessible_by(current_ability, :show).not_intern.includes(:themen) @toolbar_elements = [] @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()} if can? :new, Themengruppe @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.manage_all'), :path=>verwalten_all_themengruppen_path()} if can? :verwalten_all, Themengruppe diff --git a/app/models/themengruppe.rb b/app/models/themengruppe.rb index 2c15128..f8d515a 100644 --- a/app/models/themengruppe.rb +++ b/app/models/themengruppe.rb @@ -24,7 +24,8 @@ class Themengruppe < ActiveRecord::Base translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true scope :intern,-> {where(:public=>false)} -# scope :public,-> {where(:public=>true)} + scope :not_intern, -> {where(:public=>true)} + # scope :public,-> {where(:public=>true)} def self.find_wiki_default where(:wiki_default=>true).first diff --git a/app/themes/blue2/assets/stylesheets/application.css.scss b/app/themes/blue2/assets/stylesheets/application.css.scss index 8981275..e3127bf 100755 --- a/app/themes/blue2/assets/stylesheets/application.css.scss +++ b/app/themes/blue2/assets/stylesheets/application.css.scss @@ -12,19 +12,26 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self - * require_tree . + * ---require_tree . + + *= require blueimp-gallery-all *= require jquery.fileupload-ui *= require jquery.datetimepicker - *= require jquery.ui/dialog - *= require jquery.ui.tabs - *= require jquery.ui.progressbar + *= require jquery-ui/dialog + *= require jquery-ui/autocomplete + *= require jquery-ui/progressbar + *= require jquery-ui/tabs * require 'bootstrap' * require 'neuigkeiten' */ -$color_schema_1: #006599; + +// + +//Primary blue of this schema +$color_schema_1: darken(#006599,10%); $color_schema_2: #630CE8; $color_schema_3: #FF0021; $color_schema_4: #E8820C; @@ -36,7 +43,8 @@ $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; +// Primary Color is color number 1 +$color_prim: $color_schema_1; // #006599; //071672; $color_prim_light: lighten($color_prim ,10%); $color_prim_vlight: lighten($color_prim ,30%); $color_prim_dark: darken($color_prim ,10%); @@ -44,42 +52,45 @@ $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; + + +$link-color: $color_prim; +$link-hover-color: $color_prim_vlight; +$link-decoration: none; $bodyBackground: #FFF; //#FEFEFE; - $navbarBackground: #FFF; //$color_prim; $navbarText: $color_prim; $navbarLinkColor: $color_prim; -$navbarLinkColorHover: $color_schema_1; +$navbarLinkColorHover: $color_prim_vlight; $dropdownLinkColor: black; $navbar-default-brand-color: black; $navbarBrandColor:black; - +$navbarLinkBackgroundHover: darken($navbarBackground,10%); $navbarBackgroundHighlight: #FFF; //$navbarBackgroundHighlight:#FFFFFF; -$navbarLinkBackgroundHover: darken($navbarBackground,10%); - -$infoBackground:#65A5D1; -$infoText:#03406A; $sansFontFamily: Helvetica, Arial; +$font-family-base: Helvetica, Arial; +$font-size-base: 0.9rem; + @import 'bootstrap'; -@import 'bootstrap-responsive'; @import 'bootstrap/image-gallery'; @import 'font-awesome'; @import 'neuigkeiten'; @import 'themengruppen'; + +.navbar-light .navbar-nav a.nav-link { + color: $color_prim; +} div.header { display: block; // background: url('../../../../header1.png') no-repeat; @@ -95,7 +106,7 @@ div.header { } div.header_span { - background:white + background:white; } div.header h1 { @@ -104,13 +115,16 @@ div.header h1 { font-size:20px; line-height:32px; } + div.header img { //top:2px; //position:relative; } + div.navbar { border-bottom: $color_prim solid 3px; } + div.headerrow { } diff --git a/app/themes/blue2/assets/stylesheets/archiv/alt.bak b/app/themes/blue2/assets/stylesheets/archiv/alt.bak new file mode 100644 index 0000000..8c081c9 --- /dev/null +++ b/app/themes/blue2/assets/stylesheets/archiv/alt.bak @@ -0,0 +1,49 @@ + +@import "bootstrap/functions"; +@import "bootstrap/variables"; +@import "bootstrap/mixins"; +@import "bootstrap/root"; +@import "bootstrap/reboot"; +@import "bootstrap/type"; +@import "bootstrap/images"; +@import "bootstrap/code"; +@import "bootstrap/grid"; +@import "bootstrap/tables"; +@import "bootstrap/forms"; +@import "bootstrap/buttons"; +@import "bootstrap/transitions"; +@import "bootstrap/dropdown"; +@import "bootstrap/button-group"; +@import "bootstrap/input-group"; +@import "bootstrap/custom-forms"; +@import "bootstrap/nav"; +@import "bootstrap/navbar"; +@import "bootstrap/card"; +@import "bootstrap/breadcrumb"; +@import "bootstrap/pagination"; +@import "bootstrap/badge"; +@import "bootstrap/jumbotron"; +@import "bootstrap/alert"; +@import "bootstrap/progress"; +@import "bootstrap/media"; +@import "bootstrap/list-group"; +@import "bootstrap/close"; +@import "bootstrap/toasts"; +@import "bootstrap/modal"; +@import "bootstrap/tooltip"; +@import "bootstrap/popover"; +@import "bootstrap/carousel"; +@import "bootstrap/spinners"; +@import "bootstrap/utilities"; +@import "bootstrap/print"; + + +//$primary: #8F0; +//$link-color:#FF00FF; + +//$infoBackground:#65A5D1; +//$infoText:#03406A; + +$linkColor: $color_prim; +$linkColorHover: $color_schema_1; +$white: #FFFFFF; \ No newline at end of file diff --git a/app/themes/blue2/views/home/index.html.erb b/app/themes/blue2/views/home/index.html.erb new file mode 100755 index 0000000..d536904 --- /dev/null +++ b/app/themes/blue2/views/home/index.html.erb @@ -0,0 +1,67 @@ +
+ + +
+

<%= I18n.t('home.willkommen') %>

+<%= raw(@starttopic.text) unless @starttopic.nil? %> + + +
+
+
+ +
    +
  • + <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_facebook_omniauth_authorize_path ,class: :linkbox %> +
    • +
  • + <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path ,class: :linkbox %> +
    • +
  • + <%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %> +
    • +
  • <%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox if Studium.count > 0 %>
    • +
  • <%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %>
    • +
+ +<% cache("stickytopics_startpage_"+cache_array_key(@stickythemen)) do %> +
    + <% @stickythemen.each do |t1| %> +
  • + <%= link_to t1,:class=>:linkbox do %> + <%= render partial: "themen/nlink", object: t1 %> + <% end %> +
    • + <% end %> +
+<% end %> +<%= render 'beispiele' %> + +
+ +
+
    + <% @neuigkeiten.each do |n| %> +
  • <%= render n if can?(:show, n) %>
    • + <% end %> +
+
+ +
+<% cache("calendar_" + cache_array_key(@calentries)+params[:month].to_s+params[:year].to_s) do %> +<%= render 'calendars/calentries', :object=>@calentries %> +<% end %> + + +
+
+
+
+
+ diff --git a/app/themes/blue2/views/layouts/blue2.html.erb b/app/themes/blue2/views/layouts/blue2.html.erb index a9b8d5a..c385a05 100755 --- a/app/themes/blue2/views/layouts/blue2.html.erb +++ b/app/themes/blue2/views/layouts/blue2.html.erb @@ -8,46 +8,39 @@ - + <%= stylesheet_link_tag "application", :media=>"all"%> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> <% if content_for?(:header) %> - <%= yield :header %> + <%= yield :header %> <% else %> - Fetsite + Fetsite <% end %> -
-
-
- <% 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 %> -
-
- <%= link_to home_index_path do %> - - <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> - <% end %> -
-
- <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> -
-
- Fachschaft Elektrotechnik -
-
- +
+
+
+ <% 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 %> +
+
+ <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> + Fachschaft Elektrotechnik +
+ +
+
<% end %>
-
-
+
+
<%= yield %>
diff --git a/app/themes/blue2/views/layouts/menu.html.erb b/app/themes/blue2/views/layouts/menu.html.erb new file mode 100644 index 0000000..fc8ce3f --- /dev/null +++ b/app/themes/blue2/views/layouts/menu.html.erb @@ -0,0 +1,88 @@ + + +
+ <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> + + + + +
+ diff --git a/app/views/calendars/_calentries.html.erb b/app/views/calendars/_calentries.html.erb index 07d8fcc..e9333dd 100644 --- a/app/views/calendars/_calentries.html.erb +++ b/app/views/calendars/_calentries.html.erb @@ -1,5 +1,8 @@ <% unless object.nil? %> -<%= calendar object do |entry| %> +<%= month_calendar events: object do |date, calentries| %> +<%= I18n.l(date,format: "%d") %> +<% calentries.each do |entry| %>
<%= link_to entry.name.to_s, polymorphic_path(entry.object) %>
<% end %> + <% end %> <% end %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 081afb4..4856c8b 100755 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -2,10 +2,10 @@

<%= notice %>

  • - <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %> + <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_facebook_omniauth_authorize_path(:facebook) ,class: :linkbox %>
  • - <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %> + <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path(:ldap) ,class: :linkbox %>

diff --git a/app/views/layouts/_pretty_toolbar.html.erb b/app/views/layouts/_pretty_toolbar.html.erb index 79ae9ae..53202f5 100644 --- a/app/views/layouts/_pretty_toolbar.html.erb +++ b/app/views/layouts/_pretty_toolbar.html.erb @@ -4,6 +4,7 @@ Verwendung: Aufruf mit < % = render :partial=>'layouts/pretty_toolbar', :object=>@foo % > einen beliebigen array @foo übergeben --> +<% pretty_toolbar=nil unless defined?(pretty_toolbar) %> <% toolbar_elements = !pretty_toolbar.nil? ? pretty_toolbar : @toolbar_elements %> <% unless toolbar_elements.nil? || toolbar_elements.empty? %> - - - - - -
-
    +
    +
    - -
+
diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb index f15c6ee..cb1a7b8 100755 --- a/app/views/rubriken/index.html.erb +++ b/app/views/rubriken/index.html.erb @@ -11,18 +11,18 @@ <%= render 'tabs' %>

<%= notice %>

-
-
-
+
+
+

<%= I18n.t("rubrik.title")%>

-
+
-
+
-
<% unless @calentries.nil? or @calentries.empty? or true%> -
+
<% 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 %> diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb index 1e86d1f..7d9256c 100755 --- a/app/views/rubriken/show.html.erb +++ b/app/views/rubriken/show.html.erb @@ -17,8 +17,8 @@

<%= notice %>

-
-
+
+

<%= @rubrik.name %>

@@ -31,10 +31,10 @@ <% end%>

-
+
-
-
-
+
<% unless @calentries.nil? || @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 %> diff --git a/config/environments/development.rb b/config/environments/development.rb index 4d7c0d4..ee3d67e 100755 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,7 +1,7 @@ Fetsite::Application.configure do # Settings specified here will take precedence over those in config/application.rb - config.serve_static_files = false + config.serve_static_files = true # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development