diff --git a/app/assets/fonts/Ayuma2yk.ttf b/app/assets/fonts/Ayuma2yk.ttf new file mode 100644 index 0000000..9c69123 Binary files /dev/null and b/app/assets/fonts/Ayuma2yk.ttf differ diff --git a/app/assets/fonts/cmunrm.eot b/app/assets/fonts/cmunrm.eot new file mode 100644 index 0000000..4c2e750 Binary files /dev/null and b/app/assets/fonts/cmunrm.eot differ diff --git a/app/assets/fonts/cmunrm.svg b/app/assets/fonts/cmunrm.svg new file mode 100644 index 0000000..2d956df --- /dev/null +++ b/app/assets/fonts/cmunrm.svg @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/fonts/cmunrm.ttf b/app/assets/fonts/cmunrm.ttf new file mode 100644 index 0000000..5e182b3 Binary files /dev/null and b/app/assets/fonts/cmunrm.ttf differ diff --git a/app/assets/fonts/cmunrm.woff b/app/assets/fonts/cmunrm.woff new file mode 100644 index 0000000..9efca12 Binary files /dev/null and b/app/assets/fonts/cmunrm.woff differ diff --git a/app/assets/fonts/fetlogo.eot b/app/assets/fonts/fetlogo.eot new file mode 100644 index 0000000..6ca9679 Binary files /dev/null and b/app/assets/fonts/fetlogo.eot differ diff --git a/app/assets/fonts/fetlogo.svg b/app/assets/fonts/fetlogo.svg new file mode 100644 index 0000000..43fc5d4 --- /dev/null +++ b/app/assets/fonts/fetlogo.svg @@ -0,0 +1,12 @@ + + + +Copyright (C) 2014 by original authors @ fontello.com + + + + \ No newline at end of file diff --git a/app/assets/fonts/fetlogo.ttf b/app/assets/fonts/fetlogo.ttf new file mode 100644 index 0000000..0f0df07 Binary files /dev/null and b/app/assets/fonts/fetlogo.ttf differ diff --git a/app/assets/fonts/fetlogo.woff b/app/assets/fonts/fetlogo.woff new file mode 100644 index 0000000..e482372 Binary files /dev/null and b/app/assets/fonts/fetlogo.woff differ diff --git a/app/assets/stylesheets/fetlogo.css.scss b/app/assets/stylesheets/fetlogo.css.scss new file mode 100644 index 0000000..dc45671 --- /dev/null +++ b/app/assets/stylesheets/fetlogo.css.scss @@ -0,0 +1,53 @@ +@font-face { + font-family: 'fetlogo'; + src: font-url('fetlogo.eot?46715046'); + src: font-url('fetlogo.eot?46715046#iefix') format('embedded-opentype'), + font-url('fetlogo.woff?46715046') format('woff'), + font-url('fetlogo.ttf?46715046') format('truetype'), + font-url('fetlogo.svg?46715046#fetlogo') format('svg'); + font-weight: normal; + font-style: normal; +} +/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ +/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ +/* +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: 'fetlogo'; + src: font-url('fetlogo.svg?46715046#fetlogo') format('svg'); + } +} +*/ + + [class^="feticon-"]:before, [class*=" feticon-"]:before { + font-family: "fetlogo"; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + /* opacity: .8; */ + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + margin-left: .2em; + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ +} + +.feticon-fet_logo:before { content: '\e800'; } /* '' */ \ No newline at end of file diff --git a/app/assets/stylesheets/themes/darkblue/application.css.scss b/app/assets/stylesheets/themes/darkblue/application.css.scss index 2057e79..5f5e261 100755 --- a/app/assets/stylesheets/themes/darkblue/application.css.scss +++ b/app/assets/stylesheets/themes/darkblue/application.css.scss @@ -51,20 +51,41 @@ $navbarLinkBackgroundHover: darken($navbarBackground,10%); $infoBackground:#65A5D1; $infoText:#03406A; -$sansFontFamily: Helvetica, Arial; + +@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 { + font-family: ayuma2yk; +} 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; @@ -90,4 +111,4 @@ $box-border: lightgray solid 1px; $box-border-radius:0px; $box-background: white; @import 'layout'; -@import 'calendars'; \ No newline at end of file +@import 'calendars'; diff --git a/app/views/home/kontakt.html.erb b/app/views/home/kontakt.html.erb index 48cb162..11b1e32 100644 --- a/app/views/home/kontakt.html.erb +++ b/app/views/home/kontakt.html.erb @@ -1 +1,10 @@ -<%= I18n.t "home.kontakt" %> +
+

Kontakt

+

+ <%= I18n.t "home.kontakt" %> +

+

Service

+ +

Impressum

+

Credits

+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3841dce..a07ee93 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,14 +9,16 @@ <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %> -<%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> - <%= theme_stylesheet_link_tag "test", :media => "all" %> -<% theme_stylesheet_link_tag "mod", :media=>"all" %> - + <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> + <%= theme_stylesheet_link_tag "test", :media => "all" %> + <% theme_stylesheet_link_tag "mod", :media=>"all" %> + +--> + + <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> diff --git a/app/views/lvas/_nested_fields.html.erb b/app/views/lvas/_nested_fields.html.erb index ed6ff9d..8fef785 100644 --- a/app/views/lvas/_nested_fields.html.erb +++ b/app/views/lvas/_nested_fields.html.erb @@ -9,10 +9,13 @@ <%= f.input :name %> <%= f.input :ects, :input_html => { "style"=>"width:4em" },:size=>5 %> - <%= f.input :stunden, :input_html => { "style"=>"width:4em" }%> - <%= f.input :typ, :input_html => { "style"=>"width:4em" }%> + <%= f.input :stunden, :input_html => { "style"=>"width:4em" }%> + - <% f.input :semester , :input_html=>{:style=>"height:8em"},:collection=>@semester%> + <%= f.input :typ, :input_html => { "style"=>"width:4em" }%> + + + <%= f.input :semester , :input_html=>{:style=>"height:8em"},:collection=>@semester%> <%= f.input :pruefungsinformation,:input_html=>{:rows=>5} %> diff --git a/app/views/moduls/edit_lvas.html.erb b/app/views/moduls/edit_lvas.html.erb index 9fdea1c..3c49360 100644 --- a/app/views/moduls/edit_lvas.html.erb +++ b/app/views/moduls/edit_lvas.html.erb @@ -1,18 +1,18 @@ <%= semantic_form_for "lvas[]", :url=>update_lvas_modul_path(@modul) do |ff|%> <% i = 0 %> + <% @lvas.each do |lva|%> -<% i = i +1 %> -<%= semantic_fields_for "lvas[#{i}]", lva do |f|%> + <% i = i +1 %> + <%= semantic_fields_for "lvas[#{i}]", lva do |f|%> <%= render 'lvas/nested_fields', :f => f,:lva=>lva %> - -<% end%> + <% end%> <% end %> - +
<%= ff.actions do %> <%= ff.action :submit, :as => :button %> <%= ff.action :cancel, :as => :link %> - <% end %> +<% end %> <% end %> diff --git a/app/views/themes/darkblue/layouts/application.html.erb b/app/views/themes/darkblue/layouts/application.html.erb new file mode 100755 index 0000000..f59fd8d --- /dev/null +++ b/app/views/themes/darkblue/layouts/application.html.erb @@ -0,0 +1,69 @@ + + + + + + + + Fetsite + + + <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %> + <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> + <%= theme_stylesheet_link_tag "test", :media => "all" %> + <% theme_stylesheet_link_tag "mod", :media=>"all" %> + + + + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + + + + +
+
+
+
+
+
+ <%= link_to home_index_path do %> + + <% end %> +

+
+ + +
+
+ +
+
+
+
+
+
+ <%= yield %> +
+
+
+
+
+
+
+
+ <%= render 'layouts/login' %> Version 0.0.3a +
+
+
+
+
+ + +