diff --git a/app/assets/javascripts/pagination.js.coffee b/app/assets/javascripts/pagination.js.coffee index 59903ef..a15c96c 100644 --- a/app/assets/javascripts/pagination.js.coffee +++ b/app/assets/javascripts/pagination.js.coffee @@ -3,13 +3,13 @@ $ -> if $('#infinite-scrolling').size() > 0 more_posts_url = $('.pagination .next_page a').attr('href') - b=$(document).height() - $(window).height() - 60 + b=$(document).height() - $(window).height() - 260 if more_posts_url && $(window).scrollTop() > b $('.pagination').html(' Loading...') $.getScript more_posts_url $(window).on 'scroll', -> more_posts_url = $('.pagination .next_page a').attr('href') - b=$(document).height() - $(window).height() - 60 + b=$(document).height() - $(window).height() - 260 if more_posts_url && $(window).scrollTop() > b $('.pagination').html(' Loading...') $.getScript more_posts_url diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index 34fc843..8cf1d2f 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -25,6 +25,8 @@ a:hover { ul.linkbox-list { max-width:70em; +margin-left:auto; +margin-right:auto; } a.linkbox, div.contentbox { @@ -117,11 +119,11 @@ div.contentbox margin: 5px; } div.content-column { -max-width:70em; + max-width:70em; } div.content-wrap { -margin-left:auto; -margin-right:auto; + margin-left:auto; + margin-right:auto; } #contentdiv diff --git a/app/assets/stylesheets/themes/blue2/application.css.scss b/app/assets/stylesheets/themes/blue2/application.css.scss new file mode 100755 index 0000000..5e9bf2e --- /dev/null +++ b/app/assets/stylesheets/themes/blue2/application.css.scss @@ -0,0 +1,131 @@ + +/* + * 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 jquery.datetimepicker + *= require jquery.ui.dialog + * 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_span { +background:white +} +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:rgba(255,255,255,0.9) ; +#contentdiv { + +} +$navbar-li-minwidth: 0; + + + +$box-border: lightgray solid 1px; +$box-border-radius:0px; +$box-background: white; + +@import 'layout'; +@import 'calendars'; +@import 'formtastic-bootstrap'; + +@import 'extra'; +body { +background: url('http://localhost:3000/stvn.jpg') fixed no-repeat; +background-size:100%; +} \ No newline at end of file diff --git a/app/assets/stylesheets/themes/blue2/extra.css.scss b/app/assets/stylesheets/themes/blue2/extra.css.scss new file mode 100644 index 0000000..568f94b --- /dev/null +++ b/app/assets/stylesheets/themes/blue2/extra.css.scss @@ -0,0 +1,11 @@ +div.content-column { + max-width:100%; +} +div.content-wrap { + margin-left:auto; + margin-right:auto; +} +a.linkbox, div.contentbox +{ +border-color: $color-schema-1 +} \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 972d944..650b126 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -40,6 +40,9 @@ def get_theme + if params[:theme]== "default" + params[:theme]="blue1" + end if ThemesForRails.available_theme_names.include?(params[:theme]) params[:theme] @@ -48,6 +51,6 @@ else end end def default_url_options - {locale: I18n.locale, theme: theme_name, ansicht: nil} + {locale: I18n.locale, theme: (theme_name=="blue1") ? "default" : theme_name , ansicht: nil} end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1318273..f8be6e3 100755 Binary files a/app/views/layouts/application.html.erb and b/app/views/layouts/application.html.erb differ diff --git a/app/views/themes/blue2/home/index.html.erb b/app/views/themes/blue2/home/index.html.erb new file mode 100644 index 0000000..e6e922c --- /dev/null +++ b/app/views/themes/blue2/home/index.html.erb @@ -0,0 +1,71 @@ +
+

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

+<%= raw(@starttopic.text) %> + + +
+
+
+ +
    +
  • + <%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_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("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 %>
    • +
  • <%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %>
    • + +
+ + +

+ + <%= render 'beispiele' %> +
+
+
    + <% @neuigkeiten.each do |n| %> +
  • <%= render n if can?(:show, n) %>
    • + <% end %> +
+Verschiedene Styles +
    +
  • <%= link_to "Darkblue", home_index_path({:theme=>"darkblue"}) %>
    • +
  • <%= link_to "Blue1", home_index_path({:theme=>"blue1"}) %>
    • + +
  • <%= link_to "2003", home_index_path({:theme=>"2003"}) %>
    • +
  • <%= link_to "white_1", home_index_path({:theme=>"white_1"}) %>
    • +
+ +
+
+
+
+ diff --git a/public/stvn.jpg b/public/stvn.jpg new file mode 100644 index 0000000..cb303e1 Binary files /dev/null and b/public/stvn.jpg differ