Updated www-template to support separate upload with if, synced with CaloomUI