Merge branch 'develop'5.1-beta2

1 files changed, 0 insertions, 41 deletions

diff --git a/app/views/shared/_header.html.haml b/app/views/shared/_header.html.haml
deleted file mode 100644
index 377d8e0..0000000
--- a/app/views/shared/_header.html.haml
+++ /dev/null
@@ -1,41 +0,0 @@
-%header#main
-  .light
-    %h1.gemeinschaft-logo
-      - if @current_user && @current_user.current_tenant
-        = link_to "Gemeinschaft", tenant_path(@current_user.current_tenant)
-      - else
-        = link_to "Gemeinschaft", root_url
-
-    - if current_user
-      = form_tag '/search' do
-        %div.search-box
-          - if GuiFunction.display?('search_field_in_top_navigation_bar', current_user)
-            %input.text{:value => 'Search ...', :name => 'q'}
-            %input{:type => 'submit', :value => ''}
-
-    / Adjustable Navigation.
-    - if current_user
-      - if navigation_items.size > 0
-        - navigation_items.each do |item|
-          - if GuiFunction.display?('navigation_items_in_top_navigation_bar', current_user)
-            %span
-              = link_to item[:title], item[:url]
-        
-    - if current_user
-      .user-context
-        %a.user{:href => tenant_user_path(current_user.current_tenant.id, current_user.id)}
-          - if GuiFunction.display?('user_avatar_in_top_navigation_bar', current_user)
-            - if current_user.image? && current_user.image_url(:mini)
-              = image_tag current_user.image_url(:mini).to_s, :class => 'display'
-            - else
-              - if current_user.male?
-                = image_tag 'icons/user-male-16x.png', :class => 'display logged-out'
-              - else
-                = image_tag 'icons/user-female-16x.png', :class => 'display logged-out'
-          = current_user
-        = link_to( "[x]", log_out_path, :class => 'logout', :title => "Log out" )  # Temporary way of logging out.
-    - else
-      .user-context
-        = link_to "Sign up", sign_up_path 
-        or
-        = link_to "Log in", log_in_path