5 files changed, 45 insertions, 132 deletions
diff --git a/app/views/shared/_create_link.html.haml b/app/views/shared/_create_link.html.haml
index 0711ddf..53e9dbc 100644
--- a/app/views/shared/_create_link.html.haml
+++ b/app/views/shared/_create_link.html.haml
@@ -2,18 +2,17 @@
   - if can? :create, parent.send(child_class.name.underscore.pluralize).build
     %p
       - if t("#{child_class.name.underscore.pluralize}.index.actions.create_for").include?('translation missing') || (!(defined? short_link).nil? && short_link == true)
-        %a.btn.btn-mini.btn-primary{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) }
-          %i.icon-plus.icon-white
+        %a.btn.btn-small.btn-default{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) }
+          %i.icon-plus
           =t("#{child_class.name.underscore.pluralize}.index.actions.create")
       - else
-        %a.btn.btn-mini.btn-primary{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) }
-          %i.icon-plus.icon-white
-          / =t("#{child_class.name.underscore.pluralize}.index.actions.create_for", :resource => parent.to_s)
-          =t("#{child_class.name.underscore.pluralize}.index.actions.create")          
+        %a.btn.btn-small.btn-default{:href => method( :"new_#{parent.class.name.underscore}_#{child_class.name.underscore}_path" ).(parent) }
+          %i.icon-plus
+          =t("#{child_class.name.underscore.pluralize}.index.actions.create")
 
 - elsif !(defined? child_class).nil?
   - if can? :create, child_class
     %p
-      %a.btn.btn-mini.btn-primary{:href => method( :"new_#{child_class.name.underscore}_path" ).() }
-        %i.icon-plus.icon-white
+      %a.btn.btn-small.btn-default{:href => method( :"new_#{child_class.name.underscore}_path" ).() }
+        %i.icon-plus
         =t("#{child_class.name.underscore.pluralize}.index.actions.create")
 \ No newline at end of file
diff --git a/app/views/shared/_header.de.html.haml b/app/views/shared/_header.de.html.haml
deleted file mode 100644
index 10ad2a0..0000000
--- a/app/views/shared/_header.de.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 => 'Suchen ...', :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 => "Abmelden" )  # Temporary way of logging out.
-    - else
-      .user-context
-        = link_to "Registrieren", sign_up_path 
-        or
-        = link_to "Anmelden", log_in_path
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
diff --git a/app/views/shared/_index_view_edit_destroy_part.html.haml b/app/views/shared/_index_view_edit_destroy_part.html.haml
index 00b9e8a..6bb1e7b 100644
--- a/app/views/shared/_index_view_edit_destroy_part.html.haml
+++ b/app/views/shared/_index_view_edit_destroy_part.html.haml
@@ -1,40 +1,36 @@
-- style = 'width:90px'
-- style = ''
-
 - if !(defined? parent).nil? && !(defined? child).nil?
-  - if can? :show, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-success{:href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
-        %i.icon-info-sign.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.show")
+  %td
+    %span{:style => 'white-space: nowrap'}
+      - if can? :show, child
+        %a.btn.btn-small.btn-success{:href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
+          %i.icon-info-sign.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.show")
 
-  - if can? :edit, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
-        %i.icon-edit.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
+      - if can? :edit, child
+        %a.btn.btn-small.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
+          %i.icon-edit.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
 
-  - if can? :destroy, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"}
-        %i.icon-remove.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
+      - if can? :destroy, child
+        %a.btn.btn-small.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_destroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"}
+          %i.icon-remove.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
 
 - elsif !(defined? child).nil?
-  - if can? :show, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-success{:href => method( :"#{child.class.name.underscore}_path" ).(child) }
-        %i.icon-info-sign.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.show")
+  %td
+    %span{:style => 'white-space: nowrap'}
+      - if can? :show, child
+        %a.btn.btn-small.btn-success{:href => method( :"#{child.class.name.underscore}_path" ).(child) }
+          %i.icon-info-sign.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.show")
 
-  - if can? :edit, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) }
-        %i.icon-edit.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
-        
-  - if can? :destroy, child
-    %td{ :style => style }
-      %a.btn.btn-mini.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"}
-        %i.icon-trash.icon-white
-        =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
-\ No newline at end of file
+      - if can? :edit, child
+        %a.btn.btn-small.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) }
+          %i.icon-edit.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
+          
+      - if can? :destroy, child
+        %a.btn.btn-small.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_destroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"}
+          %i.icon-trash.icon-white
+          =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
+            
+\ No newline at end of file
diff --git a/app/views/shared/_show_edit_destroy_part.html.haml b/app/views/shared/_show_edit_destroy_part.html.haml
index e82c667..a1e8490 100644
--- a/app/views/shared/_show_edit_destroy_part.html.haml
+++ b/app/views/shared/_show_edit_destroy_part.html.haml
@@ -1,20 +1,20 @@
 %p
   - if !(defined? parent).nil? && !(defined? child).nil?
     - if can? :edit, child
-      %a.btn.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
+      %a.btn.btn-small.btn-warning{:href => method( :"edit_#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child) }
         %i.icon-edit.icon-white
-        =t("#{child.class.name.underscore.pluralize}.actions.edit")
+        =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
     - if can? :destroy, child
-      %a.btn.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"}
+      %a.btn.btn-small.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_destroy"), "data-method" => "delete", :href => method( :"#{parent.class.name.underscore}_#{child.class.name.underscore}_path" ).(parent, child), :rel => "nofollow"}
         %i.icon-trash.icon-white
-        =t("#{child.class.name.underscore.pluralize}.actions.destroy")
+        =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
 
   - elsif !(defined? child).nil?
     - if can? :edit, child
-      %a.btn.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) }
+      %a.btn.btn-small.btn-warning{:href => method( :"edit_#{child.class.name.underscore}_path" ).(child) }
         %i.icon-edit.icon-white
-        =t("#{child.class.name.underscore.pluralize}.actions.edit")
+        =t("#{child.class.name.underscore.pluralize}.index.actions.edit")
     - if can? :destroy, child
-      %a.btn.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.actions.confirm_detroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"}
+      %a.btn.btn-small.btn-danger{"data-confirm" => t("#{child.class.name.underscore.pluralize}.index.actions.confirm_destroy"), "data-method" => "delete", :href => method( :"#{child.class.name.underscore}_path" ).(child), :rel => "nofollow"}
         %i.icon-trash.icon-white
-        =t("#{child.class.name.underscore.pluralize}.actions.destroy")
-\ No newline at end of file
+        =t("#{child.class.name.underscore.pluralize}.index.actions.destroy")
+\ No newline at end of file