L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-74813-311' of https://github.com/mihailges/moodle into MOODLE_311_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2022-07-06 10:53:53 +08:00
parent b7d79061f1 60d8572d4e
commit d7f72ffdc8
5 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/outputrenderers.php
+10 -2
View File
@@ -2725,10 +2725,18 @@ EOD;
$html .= <<<EOD
<div id="file_info_{$client_id}" class="mdl-left filepicker-filelist" style="position: relative">
<div class="filepicker-filename">
<div class="filepicker-container">$currentfile<div class="dndupload-message">$strdndenabled <br/><div class="dndupload-arrow"></div></div></div>
<div class="filepicker-container">$currentfile
<div class="dndupload-message">$strdndenabled <br/>
<div class="dndupload-arrow d-flex"><i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i></div>
</div>
</div>
<div class="dndupload-progressbars"></div>
</div>
<div><div class="dndupload-target">{$strdroptoupload}<br/><div class="dndupload-arrow"></div></div></div>
<div>
<div class="dndupload-target">{$strdroptoupload}<br/>
<div class="dndupload-arrow d-flex"><i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i></div>
</div>
</div>
</div>
EOD;
}
lib/templates/filemanager_page_generallayout.mustache
+10 -2
View File
@@ -80,9 +80,17 @@
<div class="fm-content-wrapper">
<div class="fp-content"></div>
<div class="fm-empty-container">
<div class="dndupload-message">{{#str}}dndenabled_inbox{{/str}}<br/><div class="dndupload-arrow"></div></div>
<div class="dndupload-message">{{#str}}dndenabled_inbox{{/str}}<br/>
<div class="dndupload-arrow d-flex">
<i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i>
</div>
</div>
</div>
<div class="dndupload-target">{{#str}}droptoupload{{/str}}<br/>
<div class="dndupload-arrow d-flex">
<i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i>
</div>
</div>
<div class="dndupload-target">{{#str}}droptoupload{{/str}}<br/><div class="dndupload-arrow"></div></div>
<div class="dndupload-progressbars"></div>
<div class="dndupload-uploadinprogress">{{#pix}}i/loading_small{{/pix}}<span class="sr-only">{{#str}}loadinghelp{{/str}}</span></div>
</div>
theme/boost/scss/moodle/filemanager.scss
+1 -1
View File
@@ -839,11 +839,11 @@ a.ygtvspacer:hover {
}
.dndupload-arrow {
background: url([[pix:theme|fp/dnd_arrow]]) center no-repeat;
width: 100%;
height: 80px;
position: absolute;
top: 5px;
color: $gray-500;
}
.fitem.disabled .filepicker-container,
theme/boost/style/moodle.css
+2 -2
View File
@@ -15025,11 +15025,11 @@ a.ygtvspacer:hover {
display: block; }
.dndupload-arrow {
background: url([[pix:theme|fp/dnd_arrow]]) center no-repeat;
width: 100%;
height: 80px;
position: absolute;
top: 5px; }
top: 5px;
color: #8f959e; }
.fitem.disabled .filepicker-container,
.fitem.disabled .fm-empty-container {
theme/classic/style/moodle.css
+2 -2
View File
@@ -15249,11 +15249,11 @@ a.ygtvspacer:hover {
display: block; }
.dndupload-arrow {
background: url([[pix:theme|fp/dnd_arrow]]) center no-repeat;
width: 100%;
height: 80px;
position: absolute;
top: 5px; }
top: 5px;
color: #8f959e; }
.fitem.disabled .filepicker-container,
.fitem.disabled .fm-empty-container {