Bug 848000 - Demodalizing upload pages

This PR just updates the templates; we still need to change the buttons. 

Buttons should be actual links but we need some logic to change the URL based on whether the user is logged in or out. I must defer to @Osmose on how to handle that.