Merge pull request #2453 from crazyserver/MOBILE-3452

Mobile 3452

Author: jleyva

scripts/functions.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 LANGPACKSFOLDER='../../moodle-langpacks'
-stepnumber=$1
 
 function check_success_exit {
     if [ $? -ne 0 ]; then

scripts/lang_functions.php

@@ -186,7 +186,7 @@ function build_lang($lang, $keys) {
     $local = 0;
 
     $langparts = explode('-', $lang, 2);
-    $parentname = $langparts[0] ?? "";
+    $parentname = $langparts[0] ? $langparts[0] : "";
     $parent = "";
 
     echo "Processing $lang";
@@ -307,8 +307,6 @@ function detect_lang($lang, $keys) {
     $langname = $string['thislanguage'];
     $title .= " ".$langname." -D";
 
-
-
     // Add the translation to the array.
     foreach ($keys as $key => $value) {
         $string = get_translation_strings($langfoldername, $value->file);

src/addon/mod/workshop/components/index/addon-mod-workshop-index.html

@@ -112,7 +112,7 @@ <h2>{{ 'addon.mod_workshop.yoursubmission' | translate }}</h2>
                     <h2>{{ 'addon.mod_workshop.publishedsubmissions' | translate }}</h2>
                 </ion-item-divider>
                 <ng-container *ngFor="let submission of publishedSubmissions">
-                    <addon-mod-workshop-submission [submission]="submission" [courseId]="workshop.course" [module]="module" [workshop]="workshop" [access]="access" summary="true"></addon-mod-workshop-submission>
+                    <addon-mod-workshop-submission [submission]="submission" [courseId]="workshop.course" [module]="module" [workshop]="workshop" [access]="access" summary="true" class="core-as-item"></addon-mod-workshop-submission>
                 </ng-container>
             </ion-card>
         </ng-container>
@@ -134,7 +134,7 @@ <h2>{{ 'addon.mod_workshop.assignedassessments' | translate }}</h2>
                     <p>{{ 'addon.mod_workshop.assignedassessmentsnone' | translate }}</p>
                 </ion-item>
                 <ng-container *ngFor="let assessment of (assessments || [])">
-                    <addon-mod-workshop-submission [submission]="assessment.submission" [assessment]="assessment" [courseId]="workshop.course" [module]="module" [workshop]="workshop" [access]="access" summary="true"></addon-mod-workshop-submission>
+                    <addon-mod-workshop-submission [submission]="assessment.submission" [assessment]="assessment" [courseId]="workshop.course" [module]="module" [workshop]="workshop" [access]="access" summary="true" class="core-as-item"></addon-mod-workshop-submission>
                 </ng-container>
             </ion-card >
         </ng-container>
@@ -156,7 +156,7 @@ <h2>{{ 'addon.mod_workshop.gradesreport' | translate }}</h2>
             </ion-item>
 
             <ng-container *ngFor="let submission of grades">
-                <addon-mod-workshop-submission [submission]="submission" [courseId]="workshop.course" [module]="module" [workshop]="workshop" [access]="access" summary="true"></addon-mod-workshop-submission>
+                <addon-mod-workshop-submission [submission]="submission" [courseId]="workshop.course" [module]="module" [workshop]="workshop" [access]="access" summary="true" class="core-as-item"></addon-mod-workshop-submission>
             </ng-container>
 
             <ion-grid *ngIf="page > 0 || hasNextPage">

src/addon/mod/workshop/components/submission/addon-mod-workshop-submission.html

@@ -1,6 +1,6 @@
 <core-loading [hideUntil]="loaded">
     <div *ngIf="!summary">
-        <ion-list-header text-wrap>
+        <ion-item text-wrap class="addon-workshop-submission-title">
             <ion-avatar core-user-avatar [user]="profile" [courseId]="courseId" [userId]="profile && profile.id" item-start></ion-avatar>
             <h2><core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text></h2>
             <p *ngIf="profile && profile.fullname">{{profile.fullname}}</p>
@@ -21,7 +21,7 @@ <h2><core-format-text [text]="submission.title" contextLevel="module" [contextIn
                 <ng-container *ngIf="submission.offline"><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</ng-container>
                 <ng-container *ngIf="submission.deleted"><ion-icon name="trash"></ion-icon> {{ 'core.deletedoffline' | translate }}</ng-container>
             </ion-note>
-        </ion-list-header>
+        </ion-item>
         <ion-item text-wrap *ngIf="submission.content">
             <core-format-text [component]="component" [componentId]="componentId" [text]="submission.content" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
         </ion-item>

src/addon/mod/workshop/components/submission/submission.scss

@@ -1,4 +1,13 @@
-ion-app.app-root addon-mod-workshop-submission,
-ion-app.app-root .card.with-borders addon-mod-workshop-submission {
-  @include core-as-items();
+ion-app.app-root addon-mod-workshop-submission .addon-workshop-submission-title {
+
+    &.item-ios {
+        border-bottom: $list-ios-header-border-bottom;
+    }
+    &.item-md {
+        border-bottom: 1px solid $list-md-border-color;
+    }
+
+    &:last-child {
+        border: 0;
+    }
 }

src/app/app.scss

@@ -113,8 +113,8 @@ ion-app.app-root {
     @include core-as-items();
   }
 
-  .card.with-borders .item,
-  .list.with-borders .item {
+  .card.with-borders > .item,
+  .list.with-borders > .item {
     @include core-items();
   }
 

src/theme/variables.scss

@@ -527,7 +527,7 @@ $core-dd-question-colors: $white, $blue-light, #DCDCDC, #D8BFD8, #87CEFA, #DAA52
     border-bottom: $hairlines-width solid $list-ios-border-color;
   }
 
-  &:last-child > .item-inner {
+  &.item-block:last-child > .item-inner {
     border-bottom: 0;
   }
 }