shorter tab texts and introduce tab titles

Author: bluetom

classes/tabs.php

@@ -112,49 +112,50 @@ public static function get_tabrow($activelink = false, $deactivatelink = false,
         // General Settings and Subplugins.
         $targeturl = new \moodle_url('/admin/category.php', ['category' => 'lifecycle']);
         $tabrow[] = new \tabobject('settings', $targeturl,
-            get_string('general_config_header', 'tool_lifecycle'));
+            get_string('general_config_header', 'tool_lifecycle'),
+            get_string('general_config_header_title', 'tool_lifecycle'));
 
         // Tab to the draft workflows page.
         $targeturl = new \moodle_url('/admin/tool/lifecycle/workflowdrafts.php', ['id' => 'workflowdrafts']);
         $tabrow[] = new \tabobject('workflowdrafts', $targeturl,
             get_string('workflow_drafts_header', 'tool_lifecycle').$drafts,
-            get_string('workflow_drafts_header', 'tool_lifecycle'), $draftlink);
+            get_string('workflow_drafts_header_title', 'tool_lifecycle'), $draftlink);
 
         // Tab to the active workflows page.
         $targeturl = new \moodle_url('/admin/tool/lifecycle/activeworkflows.php', ['id' => 'activeworkflows']);
         $tabrow[] = new \tabobject('activeworkflows', $targeturl,
             get_string('active_workflows_header', 'tool_lifecycle').$activewf,
-            get_string('active_workflows_header', 'tool_lifecycle'), $activelink);
+            get_string('active_workflows_header_title', 'tool_lifecycle'), $activelink);
 
         // Tab to the deactivated workflows page.
         $targeturl = new \moodle_url('/admin/tool/lifecycle/deactivatedworkflows.php', ['id' => 'deactivatedworkflows']);
         $tabrow[] = new \tabobject('deactivatedworkflows', $targeturl,
             get_string('deactivated_workflows_header', 'tool_lifecycle').$deactivatedewf,
-            get_string('deactivated_workflows_header', 'tool_lifecycle'), $deactivatelink);
+            get_string('deactivated_workflows_header_title', 'tool_lifecycle'), $deactivatelink);
 
         // Tab to the delayed courses list page.
         $targeturl = new \moodle_url('/admin/tool/lifecycle/delayedcourses.php', ['id' => 'delayedcourses']);
         $tabrow[] = new \tabobject('delayedcourses', $targeturl,
             get_string('delayed_courses_header', 'tool_lifecycle').$delayedcourses,
-            get_string('delayed_courses_header', 'tool_lifecycle'));
+            get_string('delayed_courses_header_title', 'tool_lifecycle'));
 
         // Tab to the admin approval list page.
         $targeturl = new \moodle_url('/admin/tool/lifecycle/step/adminapprove/index.php', ['id' => 'adminapprove']);
         $tabrow[] = new \tabobject('adminapprove', $targeturl,
-            get_string('adminapprovals', 'lifecyclestep_adminapprove').$adminapprovals,
-            get_string('adminapprovals', 'lifecyclestep_adminapprove'));
+            get_string('adminapprovals_header', 'tool_lifecycle').$adminapprovals,
+            get_string('adminapprovals_header_title', 'tool_lifecycle'));
 
         // Tab to the course backups list page.
         $targeturl = new \moodle_url('/admin/tool/lifecycle/coursebackups.php', ['id' => 'coursebackups']);
         $tabrow[] = new \tabobject('coursebackups', $targeturl,
             get_string('course_backups_list_header', 'tool_lifecycle').$coursebackups,
-            get_string('course_backups_list_header', 'tool_lifecycle'));
+            get_string('course_backups_list_header_title', 'tool_lifecycle'));
 
         // Tab to the lifecycle errors page.
         $targeturl = new \moodle_url('/admin/tool/lifecycle/errors.php', ['id' => 'errors']);
         $tabrow[] = new \tabobject('errors', $targeturl,
             get_string('process_errors_header', 'tool_lifecycle').$lcerrors,
-            get_string('process_errors_header', 'tool_lifecycle'));
+            get_string('process_errors_header_title', 'tool_lifecycle'));
 
         return $tabrow;
 

lang/de/tool_lifecycle.php

@@ -32,11 +32,14 @@
 $string['active_manual_workflows_heading'] = 'Aktive manuelle Workflows';
 $string['active_workflow_not_changeable'] = 'Die Workflow-Instanz wurde bereits aktiviert. Je nach Schritt-Typ können dessen Einstellungen eventuell noch geändert werden. Änderungen an Trigger-Instanzen wirken sich nicht auf bereits getriggerte Kurse aus.';
 $string['active_workflow_not_removeable'] = 'Die Workflow-Instanz ist aktiv. Es ist nicht möglich, sie zu entfernen.';
-$string['active_workflows_header'] = 'Aktive Workflows';
+$string['active_workflows_header'] = 'Aktive';
+$string['active_workflows_header_title'] = 'Liste der derzeit aktiven Workflows';
 $string['active_workflows_list'] = 'Zeige aktive Workflows';
 $string['add_new_step_instance'] = 'Füge neue Schritt-Instanz hinzu...';
 $string['add_new_trigger_instance'] = 'Füge neue Trigger-Instanz...';
 $string['add_workflow'] = 'Neuen Workflow hinzufügen';
+$string['adminapprovals_header'] = 'Sysadmin';
+$string['adminapprovals_header_title'] = 'Liste der offenen Sysadmin-Bestätigungen';
 $string['adminsettings_edit_step_instance_heading'] = 'Schritt-Instanz für Workflow \'{$a}\'';
 $string['adminsettings_edit_trigger_instance_heading'] = 'Trigger-Instanz für Workflow \'{$a}\'';
 $string['adminsettings_edit_workflow_definition_heading'] = 'Workflowdefinition';
@@ -69,7 +72,8 @@
 $string['config_showcoursecounts_desc'] = 'Die Workflow-Konfigurationsseite zeigt normalerweise die Anzahl an Kursen, die durch
 die konfigurierten Trigger getriggert werden, was Performance-Probleme verursachen kann. Bei Performance-Problemen kann dies hiermit
 deaktiviert werden';
-$string['course_backups_list_header'] = 'Kurssicherungen';
+$string['course_backups_list_header'] = 'Sicherungen';
+$string['course_backups_list_header_title'] = 'Liste der lifecycle-Kurssicherungen';
 $string['courseid'] = 'Kurs-ID';
 $string['coursename'] = 'Kursname';
 $string['courses_are_delayed'] = '{$a} Kurse sind verzögert';
@@ -93,10 +97,12 @@
 $string['create_workflow_from_existing'] = 'Kopie von bestehendem Workflow erstellen';
 $string['date'] = 'Fällligkeitsdatum';
 $string['deactivated'] = 'Deaktiviert';
-$string['deactivated_workflows_header'] = 'Deaktivierte Workflows';
+$string['deactivated_workflows_header'] = 'Inaktive';
+$string['deactivated_workflows_header_title'] = 'Liste der deaktivierten Workflows';
 $string['deactivated_workflows_list'] = 'Zeige deaktivierte Workflows';
 $string['deactivated_workflows_list_header'] = 'Deaktivierte Workflows';
-$string['delayed_courses_header'] = 'Verzögerte Kurse';
+$string['delayed_courses_header'] = 'Verzögerungen';
+$string['delayed_courses_header_title'] = 'Liste von allen verzögerten Kursen';
 $string['delayed_for_workflow_until'] = 'Verzögert für "{$a->name}" bis {$a->date}';
 $string['delayed_for_workflows'] = 'Verzögert für {$a} Workflows';
 $string['delayed_globally'] = 'Global verzögert bis {$a}';
@@ -134,7 +140,8 @@
 $string['followedby_none'] = 'Keine';
 $string['force_import'] = 'Die Fehler ignorieren und den Workflow trotzdem importieren. Das kann zu unerwünschten Effekten führen.';
 $string['forselected'] = 'Für alle ausgewählten Prozesse';
-$string['general_config_header'] = 'Allgemein & Subplugins';
+$string['general_config_header'] = 'Allgemein';
+$string['general_config_header_title'] = "Allgemeine Einstellungen & Subplugins";
 $string['general_settings_header'] = 'Allgemeine Einstellungen';
 $string['globally'] = 'Globale Verzögerungen';
 $string['globally_until_date'] = 'Global bis {$a}';
@@ -188,7 +195,8 @@
 $string['privacy:metadata:tool_lifecycle_action_log:userid'] = 'ID der/des Benutzer:in, der/die die Aktion angestoßen hat.';
 $string['privacy:metadata:tool_lifecycle_action_log:workflowid'] = 'ID des Worflows innerhalb dessen die Aktion durchgeführt wurde.';
 $string['proceed'] = 'Fortfahren';
-$string['process_errors_header'] = 'Fehlermanagement';
+$string['process_errors_header'] = 'Fehler';
+$string['process_errors_header_title'] = 'Liste der Bearbeitungsfehler';
 $string['process_proceeded_event'] = 'Ein Prozess wurde fortgeführt';
 $string['process_rollback_event'] = 'Ein Prozess wurde zurückgesetzt';
 $string['process_triggered_event'] = 'Ein Prozess wurde ausgelöst';
@@ -252,7 +260,8 @@
  von allen Workflows ausgeschlossen. Das heißt, bis die Zeit abgelaufen ist, kann kein Prozess für den Kurs gestartet werden.';
 $string['workflow_displaytitle'] = 'Angezeigter Titel des Workflows';
 $string['workflow_displaytitle_help'] = 'Dieser Titel wird Nutzern beim Verwalten ihrer Kurse angezeigt.';
-$string['workflow_drafts_header'] = 'Workflow-Entwürfe';
+$string['workflow_drafts_header'] = 'Entwürfe';
+$string['workflow_drafts_header_title'] = 'Liste von Workflow-Entwürfen';
 $string['workflow_drafts_list'] = 'Zeige Workflow-Entwürfe';
 $string['workflow_duplicate_title'] = '{$a} (Kopie)';
 $string['workflow_finishdelay'] = 'Kursauschluss bei Beendigung';

lang/en/tool_lifecycle.php

@@ -32,11 +32,14 @@
 $string['active_manual_workflows_heading'] = 'Active manual workflows';
 $string['active_workflow_not_changeable'] = 'The workflow instance was already activated. Depending on the step type, some of its settings might be still editable. Changes to triggers will not affect already triggered courses.';
 $string['active_workflow_not_removeable'] = 'The workflow instance is active. It is not possible to remove it.';
-$string['active_workflows_header'] = 'Active workflows';
+$string['active_workflows_header'] = 'Active';
+$string['active_workflows_header_title'] = 'Active workflows';
 $string['active_workflows_list'] = 'List active workflows';
 $string['add_new_step_instance'] = 'Add new step instance...';
 $string['add_new_trigger_instance'] = 'Add new trigger instance...';
 $string['add_workflow'] = 'Create new workflow';
+$string['adminapprovals_header'] = 'Approvals';
+$string['adminapprovals_header_title'] = 'List of pending administrator approvals';
 $string['adminsettings_edit_step_instance_heading'] = 'Step instance for workflow \'{$a}\'';
 $string['adminsettings_edit_trigger_instance_heading'] = 'Trigger for workflow \'{$a}\'';
 $string['adminsettings_edit_workflow_definition_heading'] = 'Workflow definition';
@@ -69,7 +72,8 @@
 $string['config_showcoursecounts_desc'] = 'The workflow overview page by default shows the amount of courses which will be
 triggered by the configured triggers which can be load heavy. Disable this option if you experience issues loading the workflow
 overview.';
-$string['course_backups_list_header'] = 'Course backups';
+$string['course_backups_list_header'] = 'Backups';
+$string['course_backups_list_header_title'] = 'List of lifecycle course backups';
 $string['courseid'] = 'Course ID';
 $string['coursename'] = 'Course name';
 $string['courses_are_delayed'] = '{$a} delayed courses';
@@ -93,10 +97,12 @@
 $string['create_workflow_from_existing'] = 'Copy new workflow from existing';
 $string['date'] = 'Due date';
 $string['deactivated'] = 'Deactivated';
-$string['deactivated_workflows_header'] = 'Deactivated workflows';
+$string['deactivated_workflows_header'] = 'Deactivated';
+$string['deactivated_workflows_header_title'] = 'List of deactivated workflows';
 $string['deactivated_workflows_list'] = 'List deactivated workflows';
 $string['deactivated_workflows_list_header'] = 'Deactivated workflows';
-$string['delayed_courses_header'] = 'Delayed courses';
+$string['delayed_courses_header'] = 'Delayed';
+$string['delayed_courses_header_title'] = 'List of all delayed courses';
 $string['delayed_for_workflow_until'] = 'Delayed for "{$a->name}" until {$a->date}';
 $string['delayed_for_workflows'] = 'Delayed for {$a} workflows';
 $string['delayed_globally'] = 'Delayed globally until {$a}';
@@ -133,7 +139,8 @@
 $string['followedby_none'] = 'None';
 $string['force_import'] = 'Try ignoring errors and import the workflow anyway. Use this at your own risk!';
 $string['forselected'] = 'For all selected processes';
-$string['general_config_header'] = "General & Subplugins";
+$string['general_config_header'] = "General";
+$string['general_config_header_title'] = "General settings & subplugins";
 $string['general_settings_header'] = 'General settings';
 $string['globally'] = 'Global delays';
 $string['globally_until_date'] = 'Globally until {$a}';
@@ -188,7 +195,8 @@
 $string['privacy:metadata:tool_lifecycle_action_log:userid'] = 'ID of the user that did the action.';
 $string['privacy:metadata:tool_lifecycle_action_log:workflowid'] = 'ID of the Workflow the action was done in.';
 $string['proceed'] = 'Proceed';
-$string['process_errors_header'] = 'Error handling';
+$string['process_errors_header'] = 'Errors';
+$string['process_errors_header_title'] = 'List of process errors';
 $string['process_proceeded_event'] = 'A process has been proceeded';
 $string['process_rollback_event'] = 'A process has been rolled back';
 $string['process_triggered_event'] = 'A process has been triggered';
@@ -253,7 +261,8 @@
 for the respective course.';
 $string['workflow_displaytitle'] = 'Displayed workflow title';
 $string['workflow_displaytitle_help'] = 'This title is displayed to users when managing their courses.';
-$string['workflow_drafts_header'] = 'Workflow drafts';
+$string['workflow_drafts_header'] = 'Drafts';
+$string['workflow_drafts_header_title'] = 'List of workflow drafts';
 $string['workflow_drafts_list'] = 'List workflow drafts';
 $string['workflow_duplicate_title'] = '{$a} (Copy)';
 $string['workflow_finishdelay'] = 'Delay in case of finished course';

step/adminapprove/tests/admin_approve_test.php

@@ -77,4 +77,5 @@ public function test_admin_mail(): void {
         $this->assertCount(1, $sink->get_messages());
         $sink->close();
     }
+
 }

step/adminapprove/tests/behat/behat_lifecyclestep_adminapprove.php

@@ -0,0 +1,45 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Step definition for life cycle step adminapprove.
+ *
+ * @package    lifecyclestep_adminapprove
+ * @category   test
+ * @copyright  2025 Thomas Niedermaier University Münster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(__DIR__ . '/../../../../../../../lib/behat/behat_base.php');
+
+/**
+ * Step definition for life cycle.
+ *
+ * @package    lifecyclestep_adminapprove
+ * @category   test
+ * @copyright  2025 Thomas Niedermaier University Münster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class behat_lifecyclestep_adminapprove extends behat_base {
+    /**
+     * Opens Admin Approvals page.
+     *
+     * @Given /^I am on adminapprove page$/
+     */
+    public function i_am_on_adminapprove_page() {
+        $this->getSession()->visit($this->locate_path('/admin/tool/lifecycle/step/adminapprove/index.php'));
+    }
+}

step/adminapprove/tests/behat/proceedtest.feature

@@ -10,7 +10,7 @@ Feature: Add a workflow with an adminapprove step and test it
       | Course 4 | C4        |
     And I log in as "admin"
     And I navigate to "Plugins > Admin tools > Life Cycle" in site administration
-    And I click on "Workflow drafts" "link"
+    And I am on workflowdrafts page
     And I click on "Create new workflow" "link"
     And I set the following fields to these values:
       | Title                    | Admin Approve Step WF #1 |
@@ -30,12 +30,11 @@ Feature: Add a workflow with an adminapprove step and test it
     And I select "Delete course step" from the "tool_lifecycle-choose-step" singleselect
     And I set the field "Instance name" to "Delete Course #1"
     And I press "Save changes"
-    And I click on "Workflow drafts" "link"
+    And I am on workflowdrafts page
     And I press "Activate"
 
   Scenario: Test interaction of admin approve step
-    When I navigate to "Plugins > Admin tools > Life Cycle" in site administration
-    And I click on "Admin Approvals" "link"
+    When I am on adminapprove page
     Then I should see "There are currently no courses waiting for interaction in any Admin Approve step."
     When I run the scheduled task "tool_lifecycle\task\lifecycle_task"
     And I reload the page

step/adminapprove/tests/behat/teacherview.feature

@@ -13,7 +13,7 @@ Feature: Add a workflow with an adminapprove step and test the status in the tea
       | teacher | C1     | editingteacher |
     And I log in as "admin"
     And I navigate to "Plugins > Admin tools > Life Cycle" in site administration
-    And I click on "Workflow drafts" "link"
+    And I am on workflowdrafts page
     And I click on "Create new workflow" "link"
     And I set the following fields to these values:
       | Title                    | Admin Approve Step WF #1 |
@@ -30,7 +30,7 @@ Feature: Add a workflow with an adminapprove step and test the status in the tea
       | Instance name | Admin Approve Step #1 |
       | Status message | My status |
     And I press "Save changes"
-    And I click on "Workflow drafts" "link"
+    And I am on workflowdrafts page
     And I press "Activate"
     And I run the scheduled task "tool_lifecycle\task\lifecycle_task"
     And I log out

tests/behat/activate_workflow.feature

@@ -36,7 +36,7 @@ Feature: Add a workflow definition activate it
     And I select "Delete course step" from the "tool_lifecycle-choose-step" singleselect
     And I set the field "Instance name" to "Delete Course 2"
     And I press "Save changes"
-    And I click on "Workflow drafts" "link"
+    And I am on workflowdrafts page
     Then I should see the tool "View workflow steps" in the "My Workflow" row of the "tool_lifecycle_workflow_definitions" table
     And I should see the tool "Backup workflow" in the "My Workflow" row of the "tool_lifecycle_workflow_definitions" table
     And I should see the tool "Delete workflow" in the "My Workflow" row of the "tool_lifecycle_workflow_definitions" table

tests/behat/add_workflow.feature

@@ -26,7 +26,7 @@ Feature: Add a workflow definition
       | Capability                 | moodle/course:manageactivities            |
     And I press "Save changes"
     Then I should see "manual"
-    When I click on "Workflow drafts" "link"
+    And I am on workflowdrafts page
     Then I should see "My Workflow"
 
   Scenario: Add a new workflow definition with steps

tests/behat/disable_workflow.feature

@@ -31,7 +31,7 @@ Feature: Disable a workflow
     And I select "Delete course step" from the "tool_lifecycle-choose-step" singleselect
     And I set the field "Instance name" to "Delete Course 1"
     And I press "Save changes"
-    And I click on "Workflow drafts" "link"
+    And I am on workflowdrafts page
     And I press "Activate"
     When I wait "10" seconds
     And I run the scheduled task "tool_lifecycle\task\lifecycle_task"
@@ -71,14 +71,14 @@ Feature: Disable a workflow
     And I am on activeworkflows page
     Then I should see the row "My Workflow" in the "tool_lifecycle_active_automatic_workflows" table
     And I click on the tool "Disable workflow (processes keep running)" in the "My Workflow" row of the "tool_lifecycle_active_automatic_workflows" table
-    When I click on "Workflow drafts" "link"
+    And I am on workflowdrafts page
     And I click on "Copy new workflow from existing" "link"
     And I click on the tool "Create copy" in the "My Workflow" row of the "tool_lifecycle-select-workflow" table
     And I press "Save changes"
-    And I click on "Workflow drafts" "link"
+    And I am on workflowdrafts page
     Then I should see the row "My Workflow" in the "tool_lifecycle_workflow_definitions" table
     When I press "Activate"
     # Since no element is left, the table is not displayed anymore.
     Then I should see the row "My Workflow" in the "tool_lifecycle_active_automatic_workflows" table
-    And I click on "Workflow drafts" "link"
+    When I am on workflowdrafts page
     Then I should not see the table "tool_lifecycle_workflow_definitions"