First attemp to implement new design

modified:   ../../app/public/css/new_style.css
modified:   ../../app/views/frame/header.haml
new file:   ../../app/views/frame/subnavigation.haml
modified:   ../../app/views/layout.haml
modified:   ../../app/public/css/new_style.css
new file:   ../../app/public/images/design/error.png
new file:   ../../app/public/images/design/message.png
new file:   ../../app/public/images/design/normal.png
new file:   ../../app/public/images/design/rect-hover.png
new file:   ../../app/public/images/design/rect.png
new file:   ../../app/public/images/design/transparent-background-inactive.png
new file:   ../../app/public/images/design/transparent-background.png
new file:   ../../app/public/images/design/wood.jpg
modified:   ../../app/views/frame/header.haml
new file:   ../../app/views/frame/subnavigation.haml
modified:   ../../app/views/layout.haml
Implemented correct navigation for unregistered

new file:   trade/app/controllers/alert.rb
modified:   trade/app/controllers/authentication.rb
modified:   trade/app/controllers/home.rb
modified:   trade/app/controllers/registration.rb
modified:   trade/app/public/css/new_style.css
modified:   trade/app/public/images/logo/TradingSystem.png
modified:   trade/app/views/authentication/login.haml
modified:   trade/app/views/authentication/register.haml
modified:   trade/app/views/frame/header.haml
deleted:    trade/app/views/frame/menu_unlogged.haml
new file:   trade/app/views/frame/navigation_registerd.haml
new file:   trade/app/views/frame/navigation_unregistered.haml
modified:   trade/app/views/layout.haml
new file:   trade/app/views/frame/navigation_registerd.haml
new file:   trade/app/views/frame/navigation_unregistered.haml
More improvements for design.

Almost all links are now implemented.

modified:   ../../app/app.rb
modified:   ../../app/controllers/account_edit.rb
modified:   ../../app/controllers/authentication.rb
modified:   ../../app/controllers/home.rb
modified:   ../../app/controllers/item_sites.rb
new file:   ../../app/controllers/navigation.rb
new file:   ../../app/controllers/navigations.rb
modified:   ../../app/controllers/organisation.rb
modified:   ../../app/controllers/registration.rb
modified:   ../../app/controllers/user_sites.rb
modified:   ../../app/public/css/new_style.css
modified:   ../../app/views/frame/header.haml
modified:   ../../app/views/frame/menu_logged.haml
modified:   ../../app/views/frame/menu_org.haml
deleted:    ../../app/views/frame/navigation_registerd.haml
new file:   ../../app/views/frame/navigation_registered.haml
modified:   ../../app/views/frame/navigation_unregistered.haml
new file:   ../../app/views/frame/profile_information.haml
modified:   ../../app/views/frame/subnavigation.haml
new file:   ../../app/views/item/my_all.haml
modified:   ../../app/views/layout.haml
new file:   navigation_spec.rb
modified:   ../ModelTests/item_spec.rb
Finished implementing links

New desing has now the same behaviour like the old one.

modified:   ../../app/controllers/organisation.rb
modified:   ../../app/public/css/new_style.css
deleted:    ../../app/views/frame/menu_logged.haml
deleted:    ../../app/views/frame/menu_org.haml
modified:   ../../app/views/layout.haml
modified:   ../../app/views/organisation/edit.haml
modified:   ../../app/views/organisation/self.haml
modified:   ../../app/views/user/edit_profile.haml
Merge branch 'design' of https://github.com/ese-unibe-ch/ese2012-team1 into design
Some more changes

Removed a lot of br's...

modified:   ../../app/public/css/new_style.css
new file:   ../../app/views/description-entry-horizontal.haml
new file:   ../../app/views/description-entry-vertical.haml
modified:   ../../app/views/frame/header.haml
modified:   ../../app/views/home/user.haml
deleted:    ../../app/views/switch_and_account.haml
deleted:    ../../app/views/ultest.haml
modified:   ../../app/views/user/edit_profile.haml
Merge branch 'design' of https://github.com/ese-unibe-ch/ese2012-team1 into design
Navigation now works correctly

when pressing on profile.

modified:   ../../app/controllers/home.rb
modified:   ../../app/controllers/navigations.rb
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2012-team1 into design
Made a terrible mistake using class variables...

Now using Navigations Objects which are stored in session[:navigation]

modified:   ../../app/app.rb
modified:   ../../app/controllers/account_edit.rb
modified:   ../../app/controllers/authentication.rb
modified:   ../../app/controllers/error.rb
modified:   ../../app/controllers/home.rb
modified:   ../../app/controllers/item_actions.rb
modified:   ../../app/controllers/item_sites.rb
deleted:    ../../app/controllers/navigations.rb
modified:   ../../app/controllers/organisation.rb
modified:   ../../app/controllers/registration.rb
modified:   ../../app/controllers/user_sites.rb
renamed:    ../../app/controllers/alert.rb -> ../../app/helpers/alert.rb
new file:   ../../app/helpers/before.rb
renamed:    ../../app/controllers/navigation.rb -> ../../app/helpers/navigation.rb
new file:   ../../app/helpers/navigations.rb
modified:   ../../app/public/css/new_style.css
modified:   ../../app/views/authentication/register.haml
modified:   ../../app/views/frame/header.haml
modified:   ../../app/views/home/organisation.haml
modified:   ../../app/views/layout.haml
Some more implementations...

modified:   ../../app/controllers/item_actions.rb
modified:   ../../app/views/item/create.haml
modified:   ../../app/views/organisation/self.haml
Implemented new way for error-handling

modified:   trade/app/controllers/item_actions.rb
modified:   trade/app/controllers/item_sites.rb
modified:   trade/app/helpers/before.rb
new file:   trade/app/helpers/error_messages.rb
modified:   trade/app/public/css/new_style.css
new file:   trade/app/public/images/design/item-owner.png
modified:   trade/app/views/home/organisation.haml
modified:   trade/app/views/home/user.haml
modified:   trade/app/views/item/create.haml
new file:   trade/app/views/partials/alert-input.haml
new file:   trade/app/views/partials/alert-textarea.haml
renamed:    trade/app/views/description-entry-horizontal.haml -> trade/app/views/partials/description-entry-horizontal.haml
renamed:    trade/app/views/description-entry-vertical.haml -> trade/app/views/partials/description-entry-vertical.haml
modified:   trade/app/views/user/edit_profile.haml
Using haml instead of render

for description-entry-vertical.haml and
description-entry-horizontal.

modified:   trade/app/helpers/before.rb
modified:   trade/app/helpers/navigations.rb
modified:   trade/app/views/home/organisation.haml
modified:   trade/app/views/home/user.haml
modified:   trade/app/views/partials/description-entry-vertical.haml
modified:   trade/app/views/user/edit_profile.haml
Bug fixin'

modified:   trade/app/views/home/organisation.haml
modified:   trade/app/views/home/user.haml
modified:   trade/app/views/partials/description-entry-horizontal.haml
modified:   trade/app/views/user/edit_profile.haml
Merge branch 'master' into design
Bug fixin' and xml for navigation

Finished navigation.xml for navigation and fixed a bug
in rspec for account_shared_examples.

new file:   trade/app/helpers/navigation.xml
modified:   trade/test/ModelTests/account_shared_examples.rb
Implemented xml support for navigation

modified:   trade/app/helpers/navigation.rb
modified:   trade/app/helpers/navigations.rb
modified:   trade/app/views/user/edit_profile.haml
Made delet account button working properly.

modified:   trade/app/views/user/edit_profile.haml
Merge branch 'master' into design

Conflicts:
	trade/app/controllers/account_edit.rb
	trade/app/controllers/home.rb
	trade/app/controllers/item_actions.rb
	trade/app/controllers/organisation.rb
	trade/app/views/frame/menu_org.haml
	trade/app/views/home/organisation.haml
	trade/app/views/layout.haml
New Controller::OrganisationAdmin

Moved all pages concerning admin rights to Controller::OrganisationAdmin.
Removed alot of redirects.

modified:   trade/app/app.rb
modified:   trade/app/controllers/organisation.rb
new file:   trade/app/controllers/organisation_admin.rb
modified:   trade/app/helpers/before.rb