mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 08:26:37 +02:00
Merge branch 'MDL-56511-master' of git://github.com/andrewnicols/moodle
This commit is contained in:
Andrew Nicols
commit
6979cf56e2
238 changed files with 7613 additions and 6572 deletions
|
|
@ -52,7 +52,7 @@
|
|||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hidden-md-down col-lg-5 col-xl-4 text-truncate">
|
||||
<div class="hidden-md-down d-none d-md-block col-lg-5 col-xl-4 text-truncate">
|
||||
{{#action.actionable}}
|
||||
<a href="{{{action.url}}}">{{action.name}}</a>
|
||||
{{#action.itemcount}}
|
||||
|
|
|
|||
|
|
@ -27,17 +27,13 @@
|
|||
}
|
||||
}}
|
||||
<div class="course-info-container" id="course-info-container-{{id}}">
|
||||
<div class="hidden-sm-up hidden-tablet hidden-phone">
|
||||
<div class="d-sm-none d-lg-block">
|
||||
{{> block_myoverview/progress-chart}}
|
||||
<h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{{fullnamedisplay}}}</a></h4>
|
||||
</div>
|
||||
<div class="hidden-sm-down hidden-tablet hidden-desktop">
|
||||
{{> block_myoverview/progress-chart}}
|
||||
<h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{{fullnamedisplay}}}</a></h4>
|
||||
</div>
|
||||
<div class="hidden-xs-down hidden-md-up visible-tablet">
|
||||
<div class="d-none d-sm-block d-lg-none visible-tablet">
|
||||
<div class="media">
|
||||
<div class="media-left">
|
||||
<div class="media-left pr-3">
|
||||
<div class="media-object">
|
||||
{{> block_myoverview/progress-chart}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -27,27 +27,21 @@
|
|||
}
|
||||
}}
|
||||
<div class="col-lg-6">
|
||||
<div class="card m-b-1 courses-view-course-item">
|
||||
<div class="card-block course-info-container" id="course-info-container-{{id}}">
|
||||
<div class="hidden-sm-up hidden-phone">
|
||||
{{> block_myoverview/progress-chart}}
|
||||
<h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{{fullnamedisplay}}}</a></h4>
|
||||
</div>
|
||||
<div class="hidden-xs-down visible-phone">
|
||||
<div class="media">
|
||||
<div class="media-left">
|
||||
<div class="media-object">
|
||||
{{> block_myoverview/progress-chart}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="media-body">
|
||||
<h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{{fullnamedisplay}}}</a></h4>
|
||||
</div>
|
||||
<div class="card mb-3 courses-view-course-item">
|
||||
<div class="card-body course-info-container" id="course-info-container-{{id}}">
|
||||
|
||||
<div class="media">
|
||||
<div class="mr-2">
|
||||
{{> block_myoverview/progress-chart}}
|
||||
</div>
|
||||
<div class="media-body">
|
||||
<h4 class="h5"><a href="{{viewurl}}" class="{{^visible}}dimmed{{/visible}}">{{{fullnamedisplay}}}</a></h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="text-muted">
|
||||
{{#shortentext}} 140, {{summary}}{{/shortentext}}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -24,21 +24,27 @@
|
|||
}}
|
||||
<div id="courses-view-{{uniqid}}" data-region="courses-view">
|
||||
{{#hascourses}}
|
||||
<div class="text-xs-center text-center">
|
||||
<div class="btn-group m-y-2" role="group" data-toggle="btns">
|
||||
<a class="btn btn-default active" href="#myoverview_courses_view_in_progress" data-toggle="tab">
|
||||
{{#str}} inprogress, block_myoverview {{/str}}
|
||||
</a>
|
||||
<a class="btn btn-default" href="#myoverview_courses_view_future" data-toggle="tab">
|
||||
{{#str}} future, block_myoverview {{/str}}
|
||||
</a>
|
||||
<a class="btn btn-default" href="#myoverview_courses_view_past" data-toggle="tab">
|
||||
{{#str}} past, block_myoverview {{/str}}
|
||||
</a>
|
||||
</div>
|
||||
<div class="d-flex justify-content-center">
|
||||
<ul class="nav nav-pills my-5">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active" href="#myoverview_courses_view_in_progress" data-toggle="tab">
|
||||
{{#str}} inprogress, block_myoverview {{/str}}
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="#myoverview_courses_view_future" data-toggle="tab">
|
||||
{{#str}} future, block_myoverview {{/str}}
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="#myoverview_courses_view_past" data-toggle="tab">
|
||||
{{#str}} past, block_myoverview {{/str}}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active fade in" id="myoverview_courses_view_in_progress">
|
||||
<div class="tab-pane active fade show" id="myoverview_courses_view_in_progress">
|
||||
{{#inprogress}}
|
||||
{{< block_myoverview/courses-view-by-status }}
|
||||
{{$id}}courses-view-in-progress{{/id}}
|
||||
|
|
@ -48,12 +54,12 @@
|
|||
{{/ block_myoverview/courses-view-by-status }}
|
||||
{{/inprogress}}
|
||||
{{^inprogress}}
|
||||
<div class="text-xs-center text-center m-t-3">
|
||||
<div class="justify-content-center text-center mt-5">
|
||||
<img class="empty-placeholder-image-lg"
|
||||
src="{{urls.nocourses}}"
|
||||
alt="{{#str}} nocoursesinprogress, block_myoverview {{/str}}"
|
||||
role="presentation">
|
||||
<p class="text-muted m-t-1">{{#str}} nocoursesinprogress, block_myoverview {{/str}}</p>
|
||||
<p class="text-muted mt-3">{{#str}} nocoursesinprogress, block_myoverview {{/str}}</p>
|
||||
</div>
|
||||
{{/inprogress}}
|
||||
</div>
|
||||
|
|
@ -67,12 +73,12 @@
|
|||
{{/ block_myoverview/courses-view-by-status }}
|
||||
{{/future}}
|
||||
{{^future}}
|
||||
<div class="text-xs-center text-center m-t-3">
|
||||
<div class="justify-content-center text-center mt-5">
|
||||
<img class="empty-placeholder-image-lg"
|
||||
src="{{urls.nocourses}}"
|
||||
alt="{{#str}} nocoursesfuture, block_myoverview {{/str}}"
|
||||
role="presentation">
|
||||
<p class="text-muted m-t-1">{{#str}} nocoursesfuture, block_myoverview {{/str}}</p>
|
||||
<p class="text-muted mt-3">{{#str}} nocoursesfuture, block_myoverview {{/str}}</p>
|
||||
</div>
|
||||
{{/future}}
|
||||
</div>
|
||||
|
|
@ -86,33 +92,24 @@
|
|||
{{/ block_myoverview/courses-view-by-status }}
|
||||
{{/past}}
|
||||
{{^past}}
|
||||
<div class="text-xs-center text-center m-t-3">
|
||||
<div class="justify-content-center text-center mt-5">
|
||||
<img class="empty-placeholder-image-lg"
|
||||
src="{{urls.nocourses}}"
|
||||
alt="{{#str}} nocoursespast, block_myoverview {{/str}}"
|
||||
role="presentation">
|
||||
<p class="text-muted m-t-1">{{#str}} nocoursespast, block_myoverview {{/str}}</p>
|
||||
<p class="text-muted mt-3">{{#str}} nocoursespast, block_myoverview {{/str}}</p>
|
||||
</div>
|
||||
{{/past}}
|
||||
</div>
|
||||
</div>
|
||||
{{/hascourses}}
|
||||
{{^hascourses}}
|
||||
<div class="text-xs-center text-center m-t-3">
|
||||
<div class="justify-content-center text-center mt-5">
|
||||
<img class="empty-placeholder-image-lg"
|
||||
src="{{urls.nocourses}}"
|
||||
alt="{{#str}} nocourses, block_myoverview {{/str}}"
|
||||
role="presentation">
|
||||
<p class="text-muted m-t-1">{{#str}} nocourses, block_myoverview {{/str}}</p>
|
||||
<p class="text-muted mt-3">{{#str}} nocourses, block_myoverview {{/str}}</p>
|
||||
</div>
|
||||
{{/hascourses}}
|
||||
</div>
|
||||
{{#js}}
|
||||
require(['jquery', 'core/custom_interaction_events'], function($, customEvents) {
|
||||
var root = $('#courses-view-{{uniqid}}');
|
||||
customEvents.define(root, [customEvents.events.activate]);
|
||||
root.on(customEvents.events.activate, '[data-toggle="btns"] > .btn', function() {
|
||||
root.find('.btn.active').removeClass('active');
|
||||
});
|
||||
});
|
||||
{{/js}}
|
||||
</div>
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
<div class="col-lg-5 text-xs-right text-lg-left text-truncate">
|
||||
{{#userdate}} {{timesort}}, {{#str}} strftimerecent {{/str}} {{/userdate}}
|
||||
</div>
|
||||
<div class="hidden-md-down col-lg-7 text-truncate">
|
||||
<div class="hidden-md-down d-none d-md-block col-lg-7 text-truncate">
|
||||
{{#action.actionable}}
|
||||
<a href="{{{action.url}}}">{{action.name}}</a>
|
||||
{{#action.itemcount}}
|
||||
|
|
|
|||
|
|
@ -23,32 +23,27 @@
|
|||
{}
|
||||
}}
|
||||
<div id="timeline-view-{{uniqid}}" data-region="timeline-view">
|
||||
<div class="row text-xs-center">
|
||||
<div class="btn-group m-t-2" role="group" data-toggle="btns">
|
||||
<a class="btn btn-default active" href="#myoverview_timeline_dates" data-toggle="tab">
|
||||
<div class="d-flex justify-content-center">
|
||||
<ul class="nav nav-pills my-5">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active" href="#myoverview_timeline_dates" data-toggle="tab">
|
||||
{{#str}} sortbydates, block_myoverview {{/str}}
|
||||
</a>
|
||||
<a class="btn btn-default" href="#myoverview_timeline_courses" data-toggle="tab">
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="#myoverview_timeline_courses" data-toggle="tab">
|
||||
{{#str}} sortbycourses, block_myoverview {{/str}}
|
||||
</a>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active fade in" id="myoverview_timeline_dates">
|
||||
<div class="tab-pane active fade show" id="myoverview_timeline_dates">
|
||||
{{> block_myoverview/timeline-view-dates }}
|
||||
</div>
|
||||
<div class="tab-pane fade" id="myoverview_timeline_courses">
|
||||
{{> block_myoverview/timeline-view-courses }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{#js}}
|
||||
require(['jquery', 'core/custom_interaction_events'], function($, customEvents) {
|
||||
var root = $('#timeline-view-{{uniqid}}');
|
||||
customEvents.define(root, [customEvents.events.activate]);
|
||||
root.on(customEvents.events.activate, '[data-toggle="btns"] > .btn', function() {
|
||||
root.find('.btn.active').removeClass('active');
|
||||
});
|
||||
});
|
||||
{{/js}}
|
||||
</div>
|
||||
|
|
@ -108,7 +108,7 @@ class behat_blocks extends behat_base {
|
|||
}
|
||||
|
||||
$this->execute('behat_general::i_click_on_in_the',
|
||||
array("a[role='menuitem']", "css_element", $this->escape($blockname), "block")
|
||||
array("a[role='button']", "css_element", $this->escape($blockname), "block")
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue