diff --git a/app/views/themes/blue1/layouts/application.html.erb b/app/views/themes/blue1/layouts/application.html.erb new file mode 100755 index 0000000..1531dfd --- /dev/null +++ b/app/views/themes/blue1/layouts/application.html.erb @@ -0,0 +1,57 @@ + + + + + + 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 %> + + + + +
+
+
+
+
+
+ <%= image_tag('/fetlogo90.png',{:style=>"float:left;height:50px",:height=>"50"}) %> +

+
+ + +
+
+
+
+ + +
+
+
+
+ <%= yield %> + <%= render 'layouts/login' %> +
+
+
+
+ +
+ + + diff --git a/app/views/themes/blue1/layouts/menu.html.erb b/app/views/themes/blue1/layouts/menu.html.erb new file mode 100644 index 0000000..f85e309 --- /dev/null +++ b/app/views/themes/blue1/layouts/menu.html.erb @@ -0,0 +1,34 @@ + diff --git a/app/views/themes/blue1/themengruppen/show.html.erb b/app/views/themes/blue1/themengruppen/show.html.erb new file mode 100644 index 0000000..ffed011 --- /dev/null +++ b/app/views/themes/blue1/themengruppen/show.html.erb @@ -0,0 +1,26 @@ +
+ +

<%= @themengruppe.title %>

+

+ <%= @themengruppe.text %> +

+ + +<%= render :partial=>'layouts/pretty_toolbar' %> +
diff --git a/app/views/themes/darkblue/layouts/application.html.erb b/app/views/themes/darkblue/layouts/application.html.erb index b8220d8..4618adb 100755 --- a/app/views/themes/darkblue/layouts/application.html.erb +++ b/app/views/themes/darkblue/layouts/application.html.erb @@ -27,7 +27,7 @@
- <%= image_tag('/fetlogo.png',{:style=>"float:left"}) %> + <%= image_tag('/fetlogo90white.png',{:style=>"float:left;height:45px"}) %>

diff --git a/public/fetlogo90.png b/public/fetlogo90.png new file mode 100644 index 0000000..1905083 Binary files /dev/null and b/public/fetlogo90.png differ diff --git a/public/fetlogo90white.png b/public/fetlogo90white.png new file mode 100644 index 0000000..ed1442b Binary files /dev/null and b/public/fetlogo90white.png differ