Merge branch 'master' into v0.2

fittrackee_client/src/components/Activity/ActivityDisplay/ActivityDetails.jsx

@@ -13,15 +13,7 @@ export default function ActivityDetails(props) {
           className="fa fa-clock-o custom-fa"
           aria-hidden="true"
         />
-        Duration: {activity.duration}
-        {withPauses && (
-          <span>
-            {' '}
-            (pauses: {activity.pauses})
-            <br />
-            Moving duration: {activity.moving}
-          </span>
-        )}
+        Duration: {activity.moving}
         {recordLDexists && (
           <sup>
             <i
@@ -30,6 +22,12 @@ export default function ActivityDetails(props) {
             />
           </sup>
         )}
+        {withPauses && (
+          <span>
+            <br />
+            (pauses: {activity.pauses}, total duration: {activity.duration})
+          </span>
+        )}
       </p>
       <p>
         <i

fittrackee_client/src/components/Activity/ActivityForms/FormWithGpx.jsx

@@ -57,7 +57,7 @@ function FormWithGpx (props) {
             gpxLimit} files max):
             <input
               accept=".gpx, .zip"
-              className="form-control input-lg"
+              className="form-control form-control-file gpx-file"
               disabled={loading}
               name="gpxFile"
               required
@@ -95,7 +95,7 @@ function FormWithGpx (props) {
           <input
             type="submit"
             className="btn btn-secondary btn-lg btn-block"
-            onClick={() => history.go(-1)}
+            onClick={() => history.push('/')}
             value="Cancel"
           />
         </div>

fittrackee_client/src/components/Activity/ActivityForms/FormWithoutGpx.jsx

@@ -123,7 +123,7 @@ function FormWithoutGpx (props) {
       <input
         type="submit"
         className="btn btn-secondary btn-lg btn-block"
-        onClick={() => history.go(-1)}
+        onClick={() => history.push('/')}
         value="Cancel"
       />
     </form>