MDL-72276 block_timeline: Show current selection on timeline dropdowns

moodle · Oct 4, 2021 · 04392ab · 04392ab
1 parent 1a9bee6
commit 04392ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/blocks/timeline/templates/main.mustache b/blocks/timeline/templates/main.mustache
@@ -26,10 +26,10 @@
 <div id="block-timeline-{{uniqid}}" class="block-timeline" data-region="timeline">
     <div class="container p-0 pb-3 border-bottom">
         <div class="row no-gutters">
-            <div class="col-sm d-flex justify-content-start">
+            <div class="mr-2">
                 {{> block_timeline/nav-day-filter }}
             </div>
-            <div class="col-sm d-flex justify-content-end">
+            <div>
                 {{> block_timeline/nav-view-selector }}
             </div>
         </div>

diff --git a/blocks/timeline/templates/nav-day-filter.mustache b/blocks/timeline/templates/nav-day-filter.mustache
@@ -22,11 +22,10 @@
     Example context (json):
     {}
 }}
-<div data-region="day-filter" class="dropdown">
+<div data-region="day-filter" class="dropdown mb-1">
     <button type="button" class="btn btn-outline-secondary dropdown-toggle icon-no-margin" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
             aria-label="{{#str}} ariadayfilter, block_timeline {{/str}}" aria-controls="menudayfilter">
-        {{#pix}} i/duration {{/pix}}
-        <span class="sr-only" data-active-item-text>
+        <span data-active-item-text>
             {{#all}} {{#str}} all, core {{/str}} {{/all}}
             {{#overdue}} {{#str}} overdue, block_timeline {{/str}} {{/overdue}}
             {{#next7days}} {{#str}}next7days, block_timeline {{/str}} {{/next7days}}

diff --git a/blocks/timeline/templates/nav-view-selector.mustache b/blocks/timeline/templates/nav-view-selector.mustache
@@ -22,11 +22,10 @@
     Example context (json):
     {}
 }}
-<div data-region="view-selector" class="btn-group">
+<div data-region="view-selector" class="btn-group mb-1">
     <button type="button" class="btn btn-outline-secondary dropdown-toggle icon-no-margin" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
             aria-label="{{#str}} ariaviewselector, block_timeline{{/str}}" aria-controls="menusortby">
-        {{#pix}} t/sort_by {{/pix}}
-        <span class="sr-only" data-active-item-text>
+        <span data-active-item-text>
             {{#sorttimelinecourses}}{{#str}} sortbycourses, block_timeline{{/str}}{{/sorttimelinecourses}}
             {{#sorttimelinedates}}{{#str}} sortbydates, block_timeline {{/str}}{{/sorttimelinedates}}
         </span>