mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-81265-404' of https://github.com/junpataleta/moodle into MOODLE_404_STABLE

Browse Source
This commit is contained in:
Jun Pataleta 2024-07-11 12:08:52 +08:00
commit 17e5aaa5be
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/workshop/renderer.php
View File

@ -1261,7 +1261,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
$output = '';
$output .= $this->render_action_buttons($workshop, $userplan);
$output .= $this->heading(format_string($currentphasetitle), 3, null, 'mod_workshop-userplanheading');
$output .= $this->heading(format_string($currentphasetitle), 2, null, 'mod_workshop-userplanheading');
$output .= $this->render($userplan);
$output .= $this->view_submissions_report($workshop, $userplan, $page, $sortby, $sorthow);

15
mod/workshop/styles.css
View File

@ -243,15 +243,16 @@
.path-mod-workshop .userplan dt {
vertical-align: bottom;
white-space: normal;
color: #999;
border-bottom: 1px solid #ddd;
color: #495057;
background-color: #f5f5f5;
border-bottom: 1px solid #ced4da;
padding: 3px;
}
.path-mod-workshop .userplan dt.active {
vertical-align: top;
color: black;
border: 1px solid #ddd;
color: #212529;
border: 1px solid #ced4da;
border-bottom: 0;
border-top: 0;
background: #e7f1c3;
@ -322,7 +323,7 @@
.path-mod-workshop .userplan dd {
vertical-align: top;
border-right: 1px solid #ddd;
border-right: 1px solid #ced4da;
background-color: #f5f5f5;
margin: 0;
min-height: 180px;
@ -335,7 +336,7 @@
.path-mod-workshop .userplan dd a:hover,
.path-mod-workshop .userplan dd a:visited,
.path-mod-workshop .userplan dd a:active {
color: #999;
color: #495057;
}
.path-mod-workshop .userplan dd.active,
@ -344,7 +345,7 @@
.path-mod-workshop .userplan dd.active a:hover,
.path-mod-workshop .userplan dd.active a:visited,
.path-mod-workshop .userplan dd.active a:active {
color: black;
color: #212529;
}
.path-mod-workshop .userplan dd.lastcol {

10
mod/workshop/tests/behat/submission_types.feature
View File

@ -38,30 +38,30 @@ Feature: Submission types
| submissiontypefileavailable | 1 |
| submissiontypefilerequired | 1 |
And I press "Save and display"
Then I should see "Setup phase" in the "h3#mod_workshop-userplanheading" "css_element"
Then "Setup phase" "heading" should exist
When I navigate to "Settings" in current page administration
And I set the following fields to these values:
| submissiontypetextrequired | 0 |
And I press "Save and display"
Then I should see "Setup phase" in the "h3#mod_workshop-userplanheading" "css_element"
Then "Setup phase" "heading" should exist
When I navigate to "Settings" in current page administration
And I set the following fields to these values:
| submissiontypetextrequired | 1 |
| submissiontypefilerequired | 0 |
And I press "Save and display"
Then I should see "Setup phase" in the "h3#mod_workshop-userplanheading" "css_element"
Then "Setup phase" "heading" should exist
When I navigate to "Settings" in current page administration
And I set the following fields to these values:
| submissiontypefileavailable | 0 |
And I press "Save and display"
Then I should see "Setup phase" in the "h3#mod_workshop-userplanheading" "css_element"
Then "Setup phase" "heading" should exist
When I navigate to "Settings" in current page administration
And I set the following fields to these values:
| submissiontypefileavailable | 1 |
| submissiontypefilerequired | 1 |
| submissiontypetextavailable | 0 |
And I press "Save and display"
Then I should see "Setup phase" in the "h3#mod_workshop-userplanheading" "css_element"
Then "Setup phase" "heading" should exist
@javascript @_file_upload
Scenario: All submission fields required

2
mod/workshop/tests/behat/workshop_edit_form.feature
View File

@ -42,4 +42,4 @@ Feature: Workshop assessment with grade to pass
And I should see "You must enter a number here."
And I set the field "Assessment grade to pass" to "10"
And I press "Save and display"
Then I should see "Setup phase" in the "h3#mod_workshop-userplanheading" "css_element"
Then "Setup phase" "heading" should exist