Skip to content

Commit 3fb06c4

Browse files
author
Andreas Grabs
committed
mod_collabora: adjust code for Moodle 5.0 using Bootstrap 5.3
1 parent 9975e10 commit 3fb06c4

File tree

7 files changed

+54
-54
lines changed

7 files changed

+54
-54
lines changed

.github/workflows/release.yml renamed to .github/workflows/dev.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: release branch test
22

33
on: [push, pull_request]
44

5+
env:
6+
REPO_DIRECTORY: ${{ github.event.repository.name }}
7+
58
jobs:
69
citest:
710
name: CI test
@@ -11,7 +14,7 @@ jobs:
1114

1215
services:
1316
postgres:
14-
image: postgres:13
17+
image: postgres:14
1518
env:
1619
POSTGRES_USER: 'postgres'
1720
POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -24,7 +27,7 @@ jobs:
2427
- 5432:5432
2528

2629
mariadb:
27-
image: mariadb:10.6
30+
image: mariadb:10.11
2831
env:
2932
MYSQL_USER: 'root'
3033
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
@@ -38,24 +41,21 @@ jobs:
3841
strategy:
3942
fail-fast: false
4043
matrix:
41-
php: ['8.1', '8.2', '8.3']
44+
php: ['8.2', '8.3']
4245
database: ['mariadb', 'pgsql']
43-
moodlebranch: ['MOODLE_405_STABLE']
44-
include:
45-
- php: '7.4'
46-
moodlebranch: 'MOODLE_401_STABLE'
47-
database: 'pgsql'
46+
moodlebranch: ['main']
4847

4948
steps:
5049
- name: Check out repository code
51-
uses: actions/checkout@v3
50+
uses: actions/checkout@v4
5251
with:
5352
path: plugin
5453

5554
- name: Setup PHP ${{ matrix.php }}
5655
uses: shivammathur/setup-php@v2
5756
with:
5857
php-version: ${{ matrix.php }}
58+
extensions: pgsql, mysqli, zip, gd, xmlrpc, soap
5959
ini-values: max_input_vars=5000
6060
coverage: none
6161

@@ -91,27 +91,26 @@ jobs:
9191
run: moodle-plugin-ci savepoints
9292

9393
- name: Run mustache
94-
continue-on-error: true # This step will show errors but will not fail
9594
if: ${{ always() }}
9695
run: moodle-plugin-ci mustache
9796

9897
- name: Run grunt
99-
continue-on-error: true # This step will show errors but will not fail
10098
if: ${{ always() }}
10199
run: moodle-plugin-ci grunt --max-lint-warnings=0
102100

103101
- name: Run phpdoc
104-
continue-on-error: true # This step will show errors but will not fail
105102
if: ${{ always() }}
106103
run: moodle-plugin-ci phpdoc
107104

108105
- name: Run phpunit
109106
if: ${{ always() }}
110107
run: moodle-plugin-ci phpunit
111108

112-
- name: Run behat
109+
- name: Run behat with scss deprecations check
113110
if: ${{ always() }}
114-
run: moodle-plugin-ci behat --profile chrome
111+
run: |
112+
php /home/runner/work/$REPO_DIRECTORY/$REPO_DIRECTORY/moodle/admin/tool/behat/cli/init.php --scss-deprecations
113+
moodle-plugin-ci behat --profile chrome
115114
116115
- name: PHP Copy/Paste Detector
117116
continue-on-error: true # This step will show errors but will not fail

‎lib.php‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,27 @@
2828
* Checks whether or not a feature is supported.
2929
*
3030
* @param string $feature
31-
* @return bool
31+
* @return mixed True if module supports feature, false if not, null if doesn't know or string for the module purpose.
3232
*/
3333
function collabora_supports($feature) {
3434
switch ($feature) {
3535
case FEATURE_GROUPS:
36-
return true;
3736
case FEATURE_GROUPINGS:
38-
return true;
3937
case FEATURE_MOD_INTRO:
40-
return true;
4138
case FEATURE_COMPLETION_TRACKS_VIEWS:
39+
case FEATURE_BACKUP_MOODLE2:
40+
case FEATURE_SHOW_DESCRIPTION:
4241
return true;
42+
4343
case FEATURE_GRADE_HAS_GRADE:
44-
return false;
4544
case FEATURE_GRADE_OUTCOMES:
4645
return false;
47-
case FEATURE_BACKUP_MOODLE2:
48-
return true;
49-
case FEATURE_SHOW_DESCRIPTION:
50-
return true;
46+
5147
case FEATURE_MOD_PURPOSE:
5248
return MOD_PURPOSE_COLLABORATION;
49+
5350
default:
54-
return false;
51+
return null;
5552
}
5653
}
5754

‎templates/admin_setting_tabs.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<ul class="nav nav-tabs" role="tablist">
4545
{{#tabs}}
4646
<li class="nav-item">
47-
<a href="#{{name}}" id="tab-{{name}}" class="nav-link {{#active}}active{{/active}}" data-toggle="tab" role="tab">{{{displayname}}}</a>
47+
<a href="#{{name}}" id="tab-{{name}}" class="nav-link {{#active}}active{{/active}}" data-bs-toggle="tab" role="tab">{{{displayname}}}</a>
4848
</li>
4949
{{/tabs}}
5050
</ul>

‎templates/content.mustache‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,24 @@
5050
{{/embedded}}
5151

5252
{{^warning}}
53-
{{^embedded}}
54-
<button type="button" title="{{#str}}fullscreen, mod_collabora{{/str}}" class="collaboramodal btn btn-primary btn-sm" data-toggle="modal" data-target="#collaboramodal_{{id}}">
55-
<i class="fa fa-expand fa-lg" aria-hidden="true"></i>
56-
</button>
57-
{{/embedded}}
58-
{{{activitymenu}}}
59-
{{{lockicon}}}
60-
{{#loadfileurl}}
61-
<div class="float-right mr-2{{^embedded}} mt-2{{/embedded}}">
62-
<a href="{{{.}}}" title="{{#str}}download{{/str}}">
63-
<i class="icon fa fa-download"></i>{{#str}}download{{/str}}
64-
</a>
65-
</div>
66-
{{/loadfileurl}}
53+
<div class="d-flex justify-content-between">
54+
{{^embedded}}
55+
<button type="button" title="{{#str}}fullscreen, mod_collabora{{/str}}" class="collaboramodal btn btn-primary btn-sm me-2" data-bs-toggle="modal" data-bs-target="#collaboramodal_{{id}}">
56+
<i class="fa fa-expand fa-lg fa-fw" aria-hidden="true"></i>
57+
</button>
58+
{{/embedded}}
59+
{{{activitymenu}}}
60+
<span class="flex-grow-1 align-self-center ms-2">
61+
{{{lockicon}}}
62+
</span>
63+
{{#loadfileurl}}
64+
<div class="align-self-center me-2{{^embedded}} mt-2{{/embedded}}">
65+
<a href="{{{.}}}" title="{{#str}}download{{/str}}">
66+
<i class="icon fa fa-download"></i>{{#str}}download{{/str}}
67+
</a>
68+
</div>
69+
{{/loadfileurl}}
70+
</div>
6771
{{> mod_collabora/inline}}
6872
{{^embedded}}
6973
{{> mod_collabora/modal}}

‎templates/modal.mustache‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
<div class="modal-content h-100">
3333

3434
<!-- Modal Header -->
35-
<div class="modal-header">
36-
<button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" title="{{#str}}restorewindowsize, mod_collabora{{/str}}" >
35+
<div class="modal-header d-flex justify-content-between border-0 py-1">
36+
<button type="button" class="close-button btn btn-primary btn-sm" data-bs-dismiss="modal" title="{{#str}}restorewindowsize, mod_collabora{{/str}}" >
3737
<i class="fa fa-compress fa-lg" aria-hidden="true"> </i>
3838
</button>
39-
{{#loadfileurl}}<div class="float-right mt-2"><a href="{{{.}}}" title="{{#str}}download{{/str}}"><i class="icon fa fa-download"></i>{{#str}}download{{/str}}</a></div>{{/loadfileurl}}
39+
{{#loadfileurl}}<div class="mt-2"><a href="{{{.}}}" title="{{#str}}download{{/str}}"><i class="icon fa fa-download"></i>{{#str}}download{{/str}}</a></div>{{/loadfileurl}}
4040
</div>
4141

4242
<!-- Modal body -->
43-
<div id="collaboramodal-body_{{id}}" class="modal-body">
43+
<div id="collaboramodal-body_{{id}}" class="modal-body pt-1">
4444
<!-- The iframe is moved here when the modal is shown. -->
4545
</div>
4646
</div>

‎templates/version_viewer.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<div id="version_viewer_{{id}}" class="collapse width card">
3030
<div class="card-header">
31-
<button type="button" data-toggle="collapse" data-target="#version_viewer_{{id}}" class="btn btn-secondary btn-sm border-bottom">
31+
<button type="button" data-bs-toggle="collapse" data-bs-target="#version_viewer_{{id}}" class="btn btn-secondary btn-sm border-bottom">
3232
<i class="fa fa-chevron-right fa-lg" aria-hidden="true"> </i>
3333
</button>
3434
</div>

‎templates/version_viewer_content.mustache‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<tbody>
3636
{{#currentfileinfo}}
3737
<tr {{#iscurrent}} class="border-success" style="border-left-style:solid;border-left-width:5px;"{{/iscurrent}}>
38-
<td class="font-weight-bold"><i class="fa fa-asterisk fa-fw"></i> {{timemodified}}</td>
38+
<td class="fw-bold"><i class="fa fa-asterisk fa-fw"></i> {{timemodified}}</td>
3939
<td>
4040
{{#hasversions}}
4141
{{^iscurrent}}
@@ -66,19 +66,19 @@
6666
<a href="{{{downloadurl}}}" class="text-decoration-none" target="_blank" title="{{#str}} download {{/str}}">
6767
<i class="fa fa-download fa-fw"></i>
6868
</a>
69-
<a href="#" class="text-decoration-none" title="{{#str}} restore {{/str}}" data-toggle="collapse" data-target="#restorequestion-{{version}}">
70-
<i class="fa fa-undo fa-fw" data-toggle="collapse" data-target="#restorequestion-{{version}}"></i>
69+
<a href="#" class="text-decoration-none" title="{{#str}} restore {{/str}}" data-bs-toggle="collapse" data-bs-target="#restorequestion-{{version}}">
70+
<i class="fa fa-undo fa-fw" data-bs-toggle="collapse" data-bs-target="#restorequestion-{{version}}"></i>
7171
</a>
72-
<a href="#" class="text-decoration-none text-danger" title="{{#str}} delete {{/str}}" data-toggle="collapse" data-target="#deletequestion-{{version}}">
72+
<a href="#" class="text-decoration-none text-danger" title="{{#str}} delete {{/str}}" data-bs-toggle="collapse" data-bs-target="#deletequestion-{{version}}">
7373
<i class="fa fa-trash fa-fw"></i>
7474
</a>
7575
<!-- Confirmation toggles -->
7676
<div id="restorequestion-{{version}}" class="collapse">
77-
<a href="#" class="btn btn-secondary btn-sm" data-toggle="collapse" data-target="#restorequestion-{{version}}">{{#str}}no{{/str}}</a>
77+
<a href="#" class="btn btn-secondary btn-sm" data-bs-toggle="collapse" data-bs-target="#restorequestion-{{version}}">{{#str}}no{{/str}}</a>
7878
<a href="#" class="btn btn-primary btn-sm collabora-restore-button" data-version="{{version}}">{{#str}}yes{{/str}}</a>
7979
</div>
8080
<div id="deletequestion-{{version}}" class="collapse">
81-
<a href="#" class="btn btn-secondary btn-sm" data-toggle="collapse" data-target="#deletequestion-{{version}}">{{#str}}no{{/str}}</a>
81+
<a href="#" class="btn btn-secondary btn-sm" data-bs-toggle="collapse" data-bs-target="#deletequestion-{{version}}">{{#str}}no{{/str}}</a>
8282
<a href="#" class="btn btn-danger btn-sm collabora-deleteversion-button" data-version="{{version}}">{{#str}}yes{{/str}}</a>
8383
</div>
8484
</td>
@@ -87,13 +87,13 @@
8787
{{/hasversions}}
8888

8989
<tr>
90-
<td class="font-weight-bold">{{#str}} initialfile, mod_collabora {{/str}}</td>
90+
<td class="fw-bold">{{#str}} initialfile, mod_collabora {{/str}}</td>
9191
<td>
92-
<a href="#" class="text-decoration-none" title="{{#str}} restore {{/str}}" data-toggle="collapse" data-target="#restorequestion-init">
93-
<i class="fa fa-undo fa-fw" data-toggle="collapse" data-target="#restorequestion-init"></i>
92+
<a href="#" class="text-decoration-none" title="{{#str}} restore {{/str}}" data-bs-toggle="collapse" data-bs-target="#restorequestion-init">
93+
<i class="fa fa-undo fa-fw" data-bs-toggle="collapse" data-bs-target="#restorequestion-init"></i>
9494
</a>
9595
<div id="restorequestion-init" class="collapse">
96-
<a href="#" class="btn btn-secondary btn-sm" data-toggle="collapse" data-target="#restorequestion-init">{{#str}}no{{/str}}</a>
96+
<a href="#" class="btn btn-secondary btn-sm" data-bs-toggle="collapse" data-bs-target="#restorequestion-init">{{#str}}no{{/str}}</a>
9797
<a href="#" class="btn btn-primary btn-sm collabora-restore-button" data-version="-1">{{#str}}yes{{/str}}</a>
9898
</div>
9999
</td>

0 commit comments

Comments
 (0)