Split Resume/Upload button into two

The DetailActivity Resume/Upload Activity button has been shared, using the name 'resumeButton'. This patch adds a second button 'uploadButton'. Depending on context, one of the two buttons is made invisible.

This should have no functional changes, but it clarifies the code (resumeButton always refers to the 'Resume' function, never to the 'Upload Activity' function).