Merge pull request #4187 from alfonso-salces/MOBILE-4505

MOBILE-4505 course: Avoid show two info icons in navbar
2024-09-27 08:42:36 +02:00 · 2024-09-27 08:42:36 +02:00 · 890b1e9a9a
parent 4c9b69879e 9cedee30e6
commit 890b1e9a9a
25 changed files with 180 additions and 5 deletions
--- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html
+++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/bigbluebuttonbn/components/index/index.html
+++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/book/components/index/addon-mod-book-index.html
+++ b/src/addons/mod/book/components/index/addon-mod-book-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/chat/components/index/addon-mod-chat-index.html
+++ b/src/addons/mod/chat/components/index/addon-mod-chat-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/choice/components/index/addon-mod-choice-index.html
+++ b/src/addons/mod/choice/components/index/addon-mod-choice-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/data/components/index/addon-mod-data-index.html
+++ b/src/addons/mod/data/components/index/addon-mod-data-index.html
@ -8,11 +8,18 @@
            (action)="gotoAddEntry()" />
        <core-context-menu-item [priority]="400" *ngIf="firstEntry" [content]="'addon.mod_data.single' | translate" iconAction="fas-file"
            (action)="gotoEntry(firstEntry)" />
+
+        @if (courseContentsPage) {
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+        }
    </core-context-menu>

+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
+++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
@ -161,8 +168,9 @@
                <ion-item class="ion-text-wrap core-analysis" *ngFor="let item of items">
                    <ion-label>
                        <p class="item-heading">
-                            {{item.num}}. <core-format-text [component]="component" [componentId]="componentId" [text]="item.name"
-                                contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId" />
+                            {{item.num}}.
+                            <core-format-text [component]="component" [componentId]="componentId" [text]="item.name" contextLevel="module"
+                                [contextInstanceId]="module.id" [courseId]="courseId" />
                        </p>
                        <p>
                            <core-format-text [component]="component" [componentId]="componentId" [text]="item.label" contextLevel="module"
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@ -3,11 +3,20 @@
    <ion-button fill="clear" *ngIf="showSearch" (click)="openSearch()" [ariaLabel]="'core.search' | translate">
        <ion-icon name="fas-magnifying-glass" slot="icon-only" aria-hidden="true" />
    </ion-button>
+
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+
    <!-- Add an empty context menu so split view pages can add items, otherwise the menu disappears in some cases. -->
    <core-context-menu />
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@ -9,9 +9,16 @@
        <ion-icon name="fas-magnifying-glass" slot="icon-only" aria-hidden="true" />
    </ion-button>

-    <ion-button *ngIf="!showLoading" fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
+    @if (!courseContentsPage) {
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@ -6,11 +6,18 @@
            iconAction="fas-chart-bar" />
        <core-context-menu-item *ngIf="canViewAllAttempts" [priority]="1000" [content]="'addon.mod_h5pactivity.attempts_report' | translate"
            (action)="viewAllAttempts()" iconAction="fas-chart-bar" />
+
+        @if (courseContentsPage) {
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+        }
    </core-context-menu>

+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
+++ b/src/addons/mod/imscp/components/index/addon-mod-imscp-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
+++ b/src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/lti/components/index/addon-mod-lti-index.html
+++ b/src/addons/mod/lti/components/index/addon-mod-lti-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/page/components/index/addon-mod-page-index.html
+++ b/src/addons/mod/page/components/index/addon-mod-page-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html
+++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/url/components/index/addon-mod-url-index.html
+++ b/src/addons/mod/url/components/index/addon-mod-url-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@ -17,11 +17,18 @@
            iconAction="fas-pen" (action)="goToEditPage()" />
        <core-context-menu-item *ngIf="canEdit" [priority]="580" [content]="'addon.mod_wiki.createpage' | translate" iconAction="fas-plus"
            (action)="goToNewPage()" />
+
+        @if (courseContentsPage) {
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+        }
    </core-context-menu>

+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
+++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
+    @if (!courseContentsPage) {
    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Content. -->
--- a/src/core/features/course/pages/index/index.html
+++ b/src/core/features/course/pages/index/index.html
@ -10,11 +10,19 @@
        </ion-title>

        <ion-buttons slot="end">
+            @if (course?.format !== 'singleactivity') {
            <ion-button fill="clear" (click)="openCourseSummary()" [ariaLabel]="'core.course.coursesummary' | translate">
                <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
            </ion-button>
+
            <!-- Add an empty context menu so tab pages can add items, otherwise the menu disappears in some cases. -->
            <core-context-menu />
+            } @else {
+            <core-context-menu>
+                <core-context-menu-item [priority]="1" [content]="'core.course.coursesummary' | translate" (action)="openCourseSummary()"
+                    iconAction="fas-graduation-cap" />
+            </core-context-menu>
+            }
        </ion-buttons>
    </ion-toolbar>
 </ion-header>
--- a/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
+++ b/src/core/features/siteplugins/components/module-index/core-siteplugins-module-index.html
@ -1,8 +1,15 @@
 <!-- Buttons to add to the header. -->
 <core-navbar-buttons slot="end">
-    <ion-button fill="clear" (click)="openModuleSummary()" [ariaLabel]="'core.info' | translate">
+    @if (!courseContentsPage) {
+    <ion-button fill="clear" (click)="openModuleSummary()" aria-haspopup="true" [ariaLabel]="'core.info' | translate">
        <ion-icon name="fas-circle-info" slot="icon-only" aria-hidden="true" />
    </ion-button>
+    } @else {
+    <core-context-menu>
+        <core-context-menu-item [priority]="5000" [content]="'core.info' | translate" (action)="openModuleSummary()"
+            iconAction="fas-circle-info" />
+    </core-context-menu>
+    }
 </core-navbar-buttons>

 <!-- Activity info. -->
--- a/src/core/features/siteplugins/components/module-index/module-index.ts
+++ b/src/core/features/siteplugins/components/module-index/module-index.ts
@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-import { Component, OnInit, OnDestroy, Input, ViewChild, HostBinding } from '@angular/core';
+import { Component, OnInit, OnDestroy, Input, ViewChild, HostBinding, Optional } from '@angular/core';

 import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site';
 import { CoreCourseModuleSummaryResult } from '@features/course/components/module-summary/module-summary';
+import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreCourseModuleData } from '@features/course/services/course-helper';
 import {
@ -71,6 +72,8 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C

    jsData?: Record<string, unknown>; // Data to pass to the component.

+    constructor(@Optional() public courseContentsPage?: CoreCourseContentsPage) {}
+
    /**
     * @inheritdoc
     */