Fix merge conflicts

Author: Nick Litwin

app/submissions/submit-file/submit-file.controller.js

@@ -3,10 +3,11 @@
 
   angular.module('tc.submissions').controller('SubmitFileController', SubmitFileController);
 
-  SubmitFileController.$inject = ['$scope', '$stateParams', 'UserService', 'SubmissionsService', 'challengeToSubmitTo'];
+  SubmitFileController.$inject = ['$scope', '$stateParams', '$log', 'UserService', 'SubmissionsService', 'challengeToSubmitTo'];
 
-  function SubmitFileController($scope, $stateParams, UserService, SubmissionsService, challengeToSubmitTo) {
+  function SubmitFileController($scope, $stateParams, $log, UserService, SubmissionsService, challengeToSubmitTo) {
     var vm = this;
+    $log = $log.getInstance("SubmitFileController");
     var files = {};
     var fileUploadProgress = {};
     vm.urlRegEx = new RegExp(/^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,3})+(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=]*)?$/);
@@ -138,6 +139,8 @@
       vm.fileUploadProgress = {};
       vm.showProgress = true;
       vm.preparing = true;
+      vm.uploading = false;
+      vm.finishing = false;
       vm.submissionsBody.data.submitterComments = vm.comments;
       vm.submissionsBody.data.submitterRank = vm.submissionForm.submitterRank;
 
@@ -166,8 +169,7 @@
 
       vm.submissionsBody.data.fonts = processedFonts;
 
-      console.log('Body for request: ', vm.submissionsBody);
-      return;
+      $log.debug('Body for request: ', vm.submissionsBody);
       SubmissionsService.getPresignedURL(vm.submissionsBody, files, updateProgress);
     }
 
@@ -182,7 +184,7 @@
         if (args === 100) {
           vm.preparing = false;
           vm.uploading = true;
-          console.log('Prepared');
+          $log.debug('Prepared for upload.');
         }
       } else if (phase === 'UPLOAD') {
         // if args is object, this update is about XHRRequest's upload progress
@@ -206,21 +208,21 @@
         }
         // start next phase when UPLOAD is done
         if (vm.uploadProgress == 100) {
-          console.log('Uploaded');
+          $log.debug('Uploaded files.');
           vm.uploading = false;
           vm.finishing = true;
         }
       } else if (phase === 'FINISH') {
         // we are concerned only for completion of the phase
         if (args === 100) {
-          console.log('Finished');
+          $log.debug('Finished upload.');
           vm.finishing = false;
           vm.showProgress = false;
 
           // TODO redirect to submission listing / challenge details page
         }
       } else { // assume it to be error condition
-        console.log("Else: " + phase);
+        $log.debug("Error Condition: " + phase);
         vm.errorInUpload = true;
       }
     }

assets/css/settings/settings.scss

@@ -151,7 +151,13 @@
         width: 100%;
       }
       .section-fields {
-        max-width: 768px;
+        width: 100%;
+      }
+    }
+
+    &.tracks {
+      .section-fields {
+        width: 100%;
       }
     }
   }
@@ -303,6 +309,8 @@
       .field-label,
       angucomplete-alt {
         align-self: flex-start;
+        width: 100%;
+        margin-top: 6px;
       }
 
       .field-label {