mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-68112 core_course: Use bootstrap input-group

Browse Source
This commit is contained in:
Peter Dias 2020-03-09 12:57:49 +08:00
parent df0e58adb1
commit 95dceedd2f
7 changed files with 28 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/amd/build/local/activitychooser/selectors.min.js vendored
View File

@ -1,2 +1,2 @@
define ("core_course/local/activitychooser/selectors",["exports"],function(a){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.default=void 0;var b=function(a,b){return"[data-".concat(a,"=\"").concat(b,"\"]")},c={regions:{chooser:b("region","chooser-container"),getSectionChooserOptions:function getSectionChooserOptions(a){return"".concat(a," ").concat(b("region","chooser-options-container"))},chooserOption:{container:b("region","chooser-option-container"),actions:b("region","chooser-option-actions-container"),info:b("region","chooser-option-info-container")},chooserSummary:{container:b("region","chooser-option-summary-container"),content:b("region","chooser-option-summary-content-container"),header:b("region","summary-header"),actions:b("region","chooser-option-summary-actions-container")},carousel:b("region","carousel"),help:b("region","help"),modules:b("region","modules"),favouriteTabNav:b("region","favourite-tab-nav"),recommendedTabNav:b("region","recommended-tab-nav"),defaultTabNav:b("region","default-tab-nav"),favouriteTab:b("region","favourites"),recommendedTab:b("region","recommended"),defaultTab:b("region","default"),getModuleSelector:function getModuleSelector(a){return"[role=\"menuitem\"][data-modname=\"".concat(a,"\"]")},searchResults:b("region","search-results-container"),searchResultItems:b("region","search-result-items-container")},actions:{optionActions:{showSummary:b("action","show-option-summary"),manageFavourite:b("action","manage-module-favourite")},addChooser:b("action","add-chooser-option"),closeOption:b("action","close-chooser-option-summary"),hide:b("action","hide"),search:b("action","search"),clearSearch:b("action","clearsearch")},render:{favourites:b("render","favourites-area")},elements:{section:".section",sectionmodchooser:"button.section-modchooser-link",sitemenu:".block_site_main_menu",sitetopic:"div.sitetopic",tab:"a[data-toggle=\"tab\"]",activetab:"a[data-toggle=\"tab\"][aria-selected=\"true\"]",visibletabs:"a[data-toggle=\"tab\"]:not(.d-none)",searchicon:".searchbar-append .search-icon",clearsearch:".searchbar-append .clear"}};a.default=c;return a.default});
define ("core_course/local/activitychooser/selectors",["exports"],function(a){"use strict";Object.defineProperty(a,"__esModule",{value:!0});a.default=void 0;var b=function(a,b){return"[data-".concat(a,"=\"").concat(b,"\"]")},c={regions:{chooser:b("region","chooser-container"),getSectionChooserOptions:function getSectionChooserOptions(a){return"".concat(a," ").concat(b("region","chooser-options-container"))},chooserOption:{container:b("region","chooser-option-container"),actions:b("region","chooser-option-actions-container"),info:b("region","chooser-option-info-container")},chooserSummary:{container:b("region","chooser-option-summary-container"),content:b("region","chooser-option-summary-content-container"),header:b("region","summary-header"),actions:b("region","chooser-option-summary-actions-container")},carousel:b("region","carousel"),help:b("region","help"),modules:b("region","modules"),favouriteTabNav:b("region","favourite-tab-nav"),recommendedTabNav:b("region","recommended-tab-nav"),defaultTabNav:b("region","default-tab-nav"),favouriteTab:b("region","favourites"),recommendedTab:b("region","recommended"),defaultTab:b("region","default"),getModuleSelector:function getModuleSelector(a){return"[role=\"menuitem\"][data-modname=\"".concat(a,"\"]")},searchResults:b("region","search-results-container"),searchResultItems:b("region","search-result-items-container")},actions:{optionActions:{showSummary:b("action","show-option-summary"),manageFavourite:b("action","manage-module-favourite")},addChooser:b("action","add-chooser-option"),closeOption:b("action","close-chooser-option-summary"),hide:b("action","hide"),search:b("action","search"),clearSearch:b("action","clearsearch")},render:{favourites:b("render","favourites-area")},elements:{section:".section",sectionmodchooser:"button.section-modchooser-link",sitemenu:".block_site_main_menu",sitetopic:"div.sitetopic",tab:"a[data-toggle=\"tab\"]",activetab:"a[data-toggle=\"tab\"][aria-selected=\"true\"]",visibletabs:"a[data-toggle=\"tab\"]:not(.d-none)",searchicon:".input-group-append .search-icon",clearsearch:".input-group-append .clear"}};a.default=c;return a.default});
//# sourceMappingURL=selectors.min.js.map

2
course/amd/build/local/activitychooser/selectors.min.js.map
View File

File diff suppressed because one or more lines are too long

4
course/amd/src/local/activitychooser/selectors.js
View File

@ -83,7 +83,7 @@ export default {
tab: 'a[data-toggle="tab"]',
activetab: 'a[data-toggle="tab"][aria-selected="true"]',
visibletabs: 'a[data-toggle="tab"]:not(.d-none)',
searchicon: '.searchbar-append .search-icon',
clearsearch: '.searchbar-append .clear'
searchicon: '.input-group-append .search-icon',
clearsearch: '.input-group-append .clear'
},
};

22
course/templates/local/activitychooser/search.mustache
View File

@ -29,20 +29,22 @@
<input type="text"
data-action="search"
id="searchinput"
class="form-control form-control-lg searchinput px-3 py-2"
class="form-control searchinput"
placeholder="{{#str}} search, core {{/str}}"
name="search"
autocomplete="off"
>
<div class="searchbar-append d-flex px-3">
<div class="search-icon">
{{#pix}} a/search, core {{/pix}}
</div>
<div class="clear d-none">
<button class="btn p-0" data-action="clearsearch">
<span class="d-flex" aria-hidden="true">{{#pix}} e/cancel_solid_circle, core {{/pix}}</span>
<span class="sr-only">{{#str}} clearsearch, core {{/str}}</span>
</button>
<div class="input-group-append">
<div class="input-group-text">
<div class="search-icon">
{{#pix}} a/search, core {{/pix}}
</div>
<div class="clear d-none">
<button class="btn p-0" data-action="clearsearch">
<span class="d-flex" aria-hidden="true">{{#pix}} e/cancel_solid_circle, core {{/pix}}</span>
<span class="sr-only">{{#str}} clearsearch, core {{/str}}</span>
</button>
</div>
</div>
</div>
</div>

43
theme/boost/scss/moodle/core.scss
View File

@ -1530,44 +1530,13 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
overflow-y: hidden;
}
.modchooser .searchcontainer .searchbar {
.modchooser .searchcontainer .searchbar .input-group-append {
align-items: center;
.searchinput {
font-size: inherit;
border: 1px solid #dee2e6;
border-top-left-radius: .3rem;
border-bottom-left-radius: .3rem;
border-right: none;
}
.searchbar-append {
align-items: center;
border: 1px solid #dee2e6;
border-left: none;
border-top-right-radius: .3rem;
border-bottom-right-radius: .3rem;
i {
color: #868e96;
margin: 0;
vertical-align: middle;
}
.clear {
i {
height: 23px;
width: 23px;
font-size: 23px;
pointer-events: none;
}
}
.search-icon {
i {
height: 20px;
width: 20px;
font-size: 20px;
}
}
i {
color: #868e96;
margin: 0;
vertical-align: middle;
}
}

26
theme/boost/style/moodle.css
View File

@ -10668,32 +10668,12 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
.modchoosercontainer.noscroll {
overflow-y: hidden; }
.modchooser .searchcontainer .searchbar .searchinput {
font-size: inherit;
border: 1px solid #dee2e6;
border-top-left-radius: .3rem;
border-bottom-left-radius: .3rem;
border-right: none; }
.modchooser .searchcontainer .searchbar .searchbar-append {
align-items: center;
border: 1px solid #dee2e6;
border-left: none;
border-top-right-radius: .3rem;
border-bottom-right-radius: .3rem; }
.modchooser .searchcontainer .searchbar .searchbar-append i {
.modchooser .searchcontainer .searchbar .input-group-append {
align-items: center; }
.modchooser .searchcontainer .searchbar .input-group-append i {
color: #868e96;
margin: 0;
vertical-align: middle; }
.modchooser .searchcontainer .searchbar .searchbar-append .clear i {
height: 23px;
width: 23px;
font-size: 23px;
pointer-events: none; }
.modchooser .searchcontainer .searchbar .searchbar-append .search-icon i {
height: 20px;
width: 20px;
font-size: 20px; }
.modchoosercontainer .optionscontainer,
.modchoosercontainer .searchresultitemscontainer {

26
theme/classic/style/moodle.css
View File

@ -10875,32 +10875,12 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
.modchoosercontainer.noscroll {
overflow-y: hidden; }
.modchooser .searchcontainer .searchbar .searchinput {
font-size: inherit;
border: 1px solid #dee2e6;
border-top-left-radius: .3rem;
border-bottom-left-radius: .3rem;
border-right: none; }
.modchooser .searchcontainer .searchbar .searchbar-append {
align-items: center;
border: 1px solid #dee2e6;
border-left: none;
border-top-right-radius: .3rem;
border-bottom-right-radius: .3rem; }
.modchooser .searchcontainer .searchbar .searchbar-append i {
.modchooser .searchcontainer .searchbar .input-group-append {
align-items: center; }
.modchooser .searchcontainer .searchbar .input-group-append i {
color: #868e96;
margin: 0;
vertical-align: middle; }
.modchooser .searchcontainer .searchbar .searchbar-append .clear i {
height: 23px;
width: 23px;
font-size: 23px;
pointer-events: none; }
.modchooser .searchcontainer .searchbar .searchbar-append .search-icon i {
height: 20px;
width: 20px;
font-size: 20px; }
.modchoosercontainer .optionscontainer,
.modchoosercontainer .searchresultitemscontainer {