Removed the login fields from the base template and replaced it with a block to override in child templates.
Removed the unused kwarg on the login function.
Whitespace.
Added TODO.
Only show the file upload if we're in a directory.
Removed the block around the additional javascript to prevent it being included twice.
Added login_required on all pages.
added login function
changed login form id's
fixing merge
whitespace cleanup