mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 09:00:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-62189-master' of git://github.com/bmbrands/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2018-05-02 12:24:20 +08:00
commit 030c58dcb9
2 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
theme/boost/templates/core/filemanager_modal_generallayout.mustache
View File

@ -1,61 +1,63 @@
<div tabindex="0" class="file-picker fp-generallayout row" role="dialog" aria-live="assertive">
<div class="fp-repo-area col-md-3 nav nav-pills flex-column" role="tablist">
<div class="fp-repo nav-item" role="tab" aria-selected="false" tabindex="-1">
<a href="#" class="nav-link" tabindex="-1"><img class="fp-repo-icon" alt=" " src="#" width="16" height="16" />&nbsp;<span class="fp-repo-name"></span></a>
</div>
<div class="container">
<div tabindex="0" class="file-picker fp-generallayout row" role="dialog" aria-live="assertive">
<div class="fp-repo-area col-md-3 pr-2 nav nav-pills flex-column" role="tablist">
<div class="fp-repo nav-item" role="tab" aria-selected="false" tabindex="-1">
<a href="#" class="nav-link" tabindex="-1"><img class="fp-repo-icon" alt=" " src="#" width="16" height="16" />&nbsp;<span class="fp-repo-name"></span></a>
</div>
</div>
<div class="col-md-9">
<div class="fp-repo-items" tabindex="0">
<div class="fp-navbar bg-faded card mb-0 clearfix icon-no-spacing">
<div>
<div class="fp-toolbar">
<div class="fp-tb-back">
<a href="#" class="btn btn-secondary btn-sm">{{#str}}back, repository{{/str}}</a>
</div>
<div class="col-md-9 p-0">
<div class="fp-repo-items" tabindex="0">
<div class="fp-navbar bg-faded card mb-0 clearfix icon-no-spacing">
<div>
<div class="fp-toolbar">
<div class="fp-tb-back">
<a href="#" class="btn btn-secondary btn-sm">{{#str}}back, repository{{/str}}</a>
</div>
<div class="fp-tb-search">
<form></form>
</div>
<div class="fp-tb-refresh">
<a title="{{#str}}refresh, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
{{#pix}}a/refresh{{/pix}}
</a>
</div>
<div class="fp-tb-logout">
<a title="{{#str}}logout, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
{{#pix}}a/logout{{/pix}}
</a>
</div>
<div class="fp-tb-manage">
<a title="{{#str}}manageurl, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
{{#pix}}a/setting{{/pix}}
</a>
</div>
<div class="fp-tb-help">
<a title="{{#str}}help, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
{{#pix}}a/help{{/pix}}
</a>
</div>
<div class="fp-tb-message"></div>
</div>
<div class="fp-tb-search">
<form></form>
</div>
<div class="fp-tb-refresh">
<a title="{{#str}}refresh, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
{{#pix}}a/refresh{{/pix}}
<div class="fp-viewbar btn-group float-sm-right">
<a role="button" title="{{#str}}displayicons, repository{{/str}}" class="fp-vb-icons btn btn-secondary btn-sm" href="#">
{{#pix}}fp/view_icon_active, theme{{/pix}}
</a>
<a role="button" title="{{#str}}displaydetails, repository{{/str}}" class="fp-vb-details btn btn-secondary btn-sm" href="#">
{{#pix}}fp/view_list_active, theme{{/pix}}
</a>
<a role="button" title="{{#str}}displaytree, repository{{/str}}" class="fp-vb-tree btn btn-secondary btn-sm" href="#">
{{#pix}}fp/view_tree_active, theme{{/pix}}
</a>
</div>
<div class="fp-tb-logout">
<a title="{{#str}}logout, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
{{#pix}}a/logout{{/pix}}
</a>
</div>
<div class="fp-tb-manage">
<a title="{{#str}}manageurl, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
{{#pix}}a/setting{{/pix}}
</a>
</div>
<div class="fp-tb-help">
<a title="{{#str}}help, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
{{#pix}}a/help{{/pix}}
</a>
</div>
<div class="fp-tb-message"></div>
<div class="fp-clear-left"></div>
</div>
<div class="fp-viewbar btn-group float-sm-right">
<a role="button" title="{{#str}}displayicons, repository{{/str}}" class="fp-vb-icons btn btn-secondary btn-sm" href="#">
{{#pix}}fp/view_icon_active, theme{{/pix}}
</a>
<a role="button" title="{{#str}}displaydetails, repository{{/str}}" class="fp-vb-details btn btn-secondary btn-sm" href="#">
{{#pix}}fp/view_list_active, theme{{/pix}}
</a>
<a role="button" title="{{#str}}displaytree, repository{{/str}}" class="fp-vb-tree btn btn-secondary btn-sm" href="#">
{{#pix}}fp/view_tree_active, theme{{/pix}}
</a>
<div class="fp-pathbar">
<span class="fp-path-folder"><a class="fp-path-folder-name" href="#"></a></span>
</div>
<div class="fp-clear-left"></div>
</div>
<div class="fp-pathbar">
<span class="fp-path-folder"><a class="fp-path-folder-name" href="#"></a></span>
</div>
<div class="fp-content card"></div>
</div>
<div class="fp-content card"></div>
</div>
</div>
</div>
</div>

3
theme/boost/tests/behat/behat_theme_boost_behat_repository_upload.php
View File

@ -74,8 +74,9 @@ class behat_theme_boost_behat_repository_upload extends behat_repository_upload
$noformexception = new ExpectationException('The upload file form is not ready', $this->getSession());
$this->find(
'xpath',
"//div[contains(concat(' ', normalize-space(@class), ' '), ' file-picker ')]" .
"//div[contains(concat(' ', normalize-space(@class), ' '), ' container ')]" .
"[contains(concat(' ', normalize-space(@class), ' '), ' repository_upload ')]" .
"/descendant::div[contains(concat(' ', normalize-space(@class), ' '), ' file-picker ')]" .
"/descendant::div[contains(concat(' ', normalize-space(@class), ' '), ' fp-content ')]" .
"/descendant::div[contains(concat(' ', normalize-space(@class), ' '), ' fp-upload-form ')]" .
"/descendant::form",