Skip to content

Commit

Permalink
MDL-39851 javascript: Fixes for filepicker dialogs
Browse files Browse the repository at this point in the history
Fixes display issues with the filepicker dialogs that were
converted to M.core.dialogue.

Note: These dialogue use table based layouts and the table width is not
counted in the form that it sits in. I have changed the dialogues to have
a wider width but for really small screens this causes horizontal scrolling.

The only solution for that is to rewrite all the filepicker/filemanager dialogs
to use css for layout.
  • Loading branch information
Damyon Wiese committed Aug 15, 2013
1 parent 702d1f8 commit fd78226
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
1 change: 1 addition & 0 deletions lib/form/filemanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ M.form_filemanager.init = function(Y, options) {
headerContent: '<span id="' + labelid +'">' + M.str.moodle.edit + '</span>',
bodyContent : this.selectnode,
centered : true,
width : '480px',
modal : true,
visible : false
});
Expand Down
3 changes: 2 additions & 1 deletion repository/filepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ M.core_filepicker.init = function(Y, options) {
node.generateID();
this.process_dlg = new M.core.dialogue({
draggable : true,
bodyContent : this.fpnode,
bodyContent : node,
headerContent: M.str.repository.fileexistsdialogheader,
centered : true,
modal : true,
Expand Down Expand Up @@ -1308,6 +1308,7 @@ M.core_filepicker.init = function(Y, options) {
this.selectui = new M.core.dialogue({
headerContent: '<span id="' + fplabel +'">'+M.str.moodle.edit+'</span>',
draggable : true,
width : '450px',
bodyContent : this.selectnode,
centered : true,
modal : true,
Expand Down
1 change: 0 additions & 1 deletion theme/base/style/filemanager.css
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
/*
* Select Dialogue (File Picker and File Manager)
*/
.file-picker.fp-select {width:420px;}
.fp-select form {padding: 20px 20px 0;}
.fp-select .fp-select-loading {text-align: center;margin-top: 20px;}
.fp-select .fp-hr {clear: both;height: 1px; background-color: #FFFFFF;border-bottom: 1px solid #BBBBBB;width: auto; margin: 10px 0;}
Expand Down
3 changes: 0 additions & 3 deletions theme/bootstrapbase/less/moodle/filemanager.less
Original file line number Diff line number Diff line change
Expand Up @@ -697,9 +697,6 @@ a.ygtvspacer:hover {
padding-top: 50px;
}
// Select Dialogue (File Picker and File Manager)
.file-picker.fp-select {
width: 420px;
}
.fp-select form {
padding: 20px 20px 0;
}
Expand Down
2 changes: 1 addition & 1 deletion theme/bootstrapbase/style/moodle.css

Large diffs are not rendered by default.

0 comments on commit fd78226

Please sign in to comment.