From 79bd220fca00e1d3b3f9d266c2d3c6fcd6120b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 15 Jun 2018 16:25:23 +0200
Subject: [PATCH 1/2] MOBILE-2430 splitview: Erase padding-top on content

---
 src/components/ion-tabs/ion-tabs.scss                     | 2 +-
 src/components/split-view/split-view.scss                 | 3 +++
 src/core/course/components/format/core-course-format.html | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/ion-tabs/ion-tabs.scss b/src/components/ion-tabs/ion-tabs.scss
index 1cb04e2f4..f08ca2a8a 100644
--- a/src/components/ion-tabs/ion-tabs.scss
+++ b/src/components/ion-tabs/ion-tabs.scss
@@ -81,7 +81,7 @@ core-ion-tab.show-tab {
 }
 
 .ios {
-    @include core-ion-tabs-statusbar-padding($toolbar-ios-height, $toolbar-ios-padding, $content-ios-padding, $cordova-ios-statusbar-padding, $cordova-ios-statusbar-padding-modal-max-width, true);
+    @include core-ion-tabs-statusbar-padding($toolbar-ios-height + 15, $toolbar-ios-padding, $content-ios-padding, $cordova-ios-statusbar-padding, $cordova-ios-statusbar-padding-modal-max-width, true);
 }
 
 .md {
diff --git a/src/components/split-view/split-view.scss b/src/components/split-view/split-view.scss
index a88d5cd97..ef7534bcb 100644
--- a/src/components/split-view/split-view.scss
+++ b/src/components/split-view/split-view.scss
@@ -39,4 +39,7 @@ core-split-view {
     ion-header {
         display: none;
     }
+    ion-content.statusbar-padding:first-child .scroll-content {
+        padding-top: 0 !important;
+    }
 }
diff --git a/src/core/course/components/format/core-course-format.html b/src/core/course/components/format/core-course-format.html
index 905800187..9471f649a 100644
--- a/src/core/course/components/format/core-course-format.html
+++ b/src/core/course/components/format/core-course-format.html
@@ -2,7 +2,7 @@
 <core-dynamic-component [component]="courseFormatComponent" [data]="data">
     <!-- Course summary. By default we only display the course progress. -->
     <core-dynamic-component [component]="courseSummaryComponent" [data]="data">
-        <ion-list no-lines>
+        <ion-list no-lines *ngIf="course.imageThumb || (course.progress != null && course.progress >= 0)">
             <div *ngIf="course.imageThumb" class="core-course-thumb">
                 <img [src]="course.imageThumb" core-external-content alt=""/>
             </div>

From 770304d994463ed3cb9c56b369ac8df6bbae8b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 18 Jun 2018 11:53:31 +0200
Subject: [PATCH 2/2] MOBILE-2430 completion: Add missing strings

---
 src/lang/en.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lang/en.json b/src/lang/en.json
index 37b28852d..cbb09a371 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -27,10 +27,14 @@
     "commentsnotworking": "Comments cannot be retrieved",
     "completion-alt-auto-fail": "Completed: {{$a}} (did not achieve pass grade)",
     "completion-alt-auto-n": "Not completed: {{$a}}",
+    "completion-alt-auto-n-override": "Not completed: {{$a.modname}} (set by {{$a.overrideuser}})",
     "completion-alt-auto-pass": "Completed: {{$a}} (achieved pass grade)",
     "completion-alt-auto-y": "Completed: {{$a}}",
+    "completion-alt-auto-y-override": "Completed: {{$a.modname}} (set by {{$a.overrideuser}})",
     "completion-alt-manual-n": "Not completed: {{$a}}. Select to mark as complete.",
+    "completion-alt-manual-n-override": "Not completed: {{$a.modname}} (set by {{$a.overrideuser}}). Select to mark as complete.",
     "completion-alt-manual-y": "Completed: {{$a}}. Select to mark as not complete.",
+    "completion-alt-manual-y-override": "Completed: {{$a.modname}} (set by {{$a.overrideuser}}). Select to mark as not complete.",
     "confirmcanceledit": "Are you sure you want to leave this page? All changes will be lost.",
     "confirmdeletefile": "Are you sure you want to delete this file?",
     "confirmloss": "Are you sure? All changes will be lost.",