diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 38f8bd0..1531dfd 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,11 +4,12 @@ Fetsite - - <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.nil? %> -<%= stylesheet_link_tag "application", :media=>"all" if theme_name.nil? %> - + + <%= 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" %> @@ -18,28 +19,39 @@ <%= csrf_meta_tags %> - -
-
-
-<%= image_tag('/fetlogo.png',{:style=>"float:left"}) %> -

Fachschaft Elektrotechnik

-
-
-
-
+ +
+
+
+
+
+
+ <%= image_tag('/fetlogo90.png',{:style=>"float:left;height:50px",:height=>"50"}) %> +

+
+ + +
+
+
+
+ - - - <%= render 'layouts/login' %> -
-
- - <%= yield %> -
-
+
+
+
+
+ <%= yield %> + <%= render 'layouts/login' %> +
+
+
+
-
- +
+ + diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb old mode 100755 new mode 100644 index 241aded..d6ea8f5 --- a/app/views/layouts/menu.html.erb +++ b/app/views/layouts/menu.html.erb @@ -1,7 +1,7 @@
- + @@ -12,24 +12,24 @@
  • <%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
  • <%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %>
    • +
  • <%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %>
  • <%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %>
  • <%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %>
  • <%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %>
    • -
  • - -
  • <%if I18n.locale == :en %> - <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> - <% elsif I18n.locale == :de %> - <%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> - <%end %> -
    • - +
  • <%= link_to I18n.t("home.search"), search_home_index_path %>
  • <%= link_to 'Admin' , config_path%>
    • + <%if I18n.locale == :en %> + <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> + <% elsif I18n.locale == :de %> + <%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> + <%end %> + +
    -
    -
    + + diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb index 6da95cd..ffed011 100644 --- a/app/views/themengruppen/show.html.erb +++ b/app/views/themengruppen/show.html.erb @@ -1,30 +1,26 @@ -

    <%= @themengruppe.title %>

    +
    +

    <%= @themengruppe.title %>

    <%= @themengruppe.text %>

    - -
    - <% @themen.each do |thema| %> -
    -
    - - <%= thema.title %> - -
    -
    -
    - <% unless thema.gremium.nil? %> -

    <%= link_to "Zu dem Gremium ..." , thema.gremium %> -

    -<% end %> - <%= render :partial => 'themen/small', :object => thema %> - - -
    -
    -
    +
    + <%= render :partial=>'layouts/pretty_toolbar' %> +
    diff --git a/app/views/themes/2003/layouts/application.html.erb b/app/views/themes/2003/layouts/application.html.erb deleted file mode 100755 index b8220d8..0000000 --- a/app/views/themes/2003/layouts/application.html.erb +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - 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('/fetlogo.png',{:style=>"float:left"}) %> -

    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - <%= yield %> - <%= render 'layouts/login' %> -
    -
    -
    -
    - -
    - - - diff --git a/app/views/themes/blue1/layouts/application.html.erb b/app/views/themes/blue1/layouts/application.html.erb deleted file mode 100755 index 1531dfd..0000000 --- a/app/views/themes/blue1/layouts/application.html.erb +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - 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 deleted file mode 100644 index f85e309..0000000 --- a/app/views/themes/blue1/layouts/menu.html.erb +++ /dev/null @@ -1,34 +0,0 @@ -
    -
    -
    - - - - - - -
    -
      -
    • <%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %> -
      • -
    • <%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %>
      • - -
    • <%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %>
      • -
    • <%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %>
      • -
    • <%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %>
      • -
    • <%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %>
      • -
    • - <%= link_to 'Admin' , config_path%> -
      • -
    - <%if I18n.locale == :en %> - <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> - <% elsif I18n.locale == :de %> - <%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> - <%end %> - - -
    -
    -
    -
    diff --git a/app/views/themes/blue1/themengruppen/show.html.erb b/app/views/themes/blue1/themengruppen/show.html.erb deleted file mode 100644 index ffed011..0000000 --- a/app/views/themes/blue1/themengruppen/show.html.erb +++ /dev/null @@ -1,26 +0,0 @@ -
    - -

    <%= @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 deleted file mode 100755 index 4618adb..0000000 --- a/app/views/themes/darkblue/layouts/application.html.erb +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - 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('/fetlogo90white.png',{:style=>"float:left;height:45px"}) %> -

    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - <%= yield %> - <%= render 'layouts/login' %> -
    -
    -
    -
    - -
    - - - diff --git a/app/views/themes/darkblue/layouts/menu.html.erb b/app/views/themes/darkblue/layouts/menu.html.erb deleted file mode 100644 index f85e309..0000000 --- a/app/views/themes/darkblue/layouts/menu.html.erb +++ /dev/null @@ -1,34 +0,0 @@ -
    -
    -
    - - - - - - -
    -
      -
    • <%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %> -
      • -
    • <%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %>
      • - -
    • <%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %>
      • -
    • <%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %>
      • -
    • <%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %>
      • -
    • <%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %>
      • -
    • - <%= link_to 'Admin' , config_path%> -
      • -
    - <%if I18n.locale == :en %> - <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> - <% elsif I18n.locale == :de %> - <%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> - <%end %> - - -
    -
    -
    -
    diff --git a/app/views/themes/white_1/layouts/application.html.erb b/app/views/themes/white_1/layouts/application.html.erb new file mode 100755 index 0000000..38f8bd0 --- /dev/null +++ b/app/views/themes/white_1/layouts/application.html.erb @@ -0,0 +1,45 @@ + + + + + + Fetsite + + <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.nil? %> +<%= stylesheet_link_tag "application", :media=>"all" if theme_name.nil? %> + + + + + + + + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + + + +
    +
    +
    +<%= image_tag('/fetlogo.png',{:style=>"float:left"}) %> +

    Fachschaft Elektrotechnik

    +
    +
    + +
    +
    + + + + <%= render 'layouts/login' %> +
    +
    + + <%= yield %> +
    +
    + +
    + + diff --git a/app/views/themes/2003/layouts/menu.html.erb b/app/views/themes/white_1/layouts/menu.html.erb old mode 100644 new mode 100755 similarity index 70% rename from app/views/themes/2003/layouts/menu.html.erb rename to app/views/themes/white_1/layouts/menu.html.erb index f85e309..241aded --- a/app/views/themes/2003/layouts/menu.html.erb +++ b/app/views/themes/white_1/layouts/menu.html.erb @@ -1,7 +1,7 @@
    - + @@ -12,23 +12,24 @@
  • <%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
  • <%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %>
    • -
  • <%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %>
  • <%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %>
  • <%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %>
  • <%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %>
    • +
  • + +
  • <%if I18n.locale == :en %> + <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> + <% elsif I18n.locale == :de %> + <%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> + <%end %> +
    • +
  • <%= link_to 'Admin' , config_path%>
    • - <%if I18n.locale == :en %> - <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> - <% elsif I18n.locale == :de %> - <%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> - <%end %> - -
    -
    -
    + + diff --git a/app/views/themes/white_1/themengruppen/show.html.erb b/app/views/themes/white_1/themengruppen/show.html.erb new file mode 100644 index 0000000..6da95cd --- /dev/null +++ b/app/views/themes/white_1/themengruppen/show.html.erb @@ -0,0 +1,30 @@ +

    <%= @themengruppe.title %>

    + +

    + <%= @themengruppe.text %> +

    + +
    + <% @themen.each do |thema| %> +
    +
    + + <%= thema.title %> + +
    +
    +
    + <% unless thema.gremium.nil? %> +

    <%= link_to "Zu dem Gremium ..." , thema.gremium %> +

    +<% end %> + <%= render :partial => 'themen/small', :object => thema %> + + +
    +
    +
    + <% end %> +
    + +<%= render :partial=>'layouts/pretty_toolbar' %>