Permalink
Browse files

MDL-33218 Filemanager and Filepicker IE issue

  • Loading branch information...
barbararamiro committed May 28, 2012
1 parent 4631e39 commit 6077e3813c2435e6ca0a39bf26ed09ee414ae303
Showing with 36 additions and 37 deletions.
  1. +24 −25 files/renderer.php
  2. +12 −12 theme/base/style/filemanager.css
View
@@ -303,8 +303,7 @@ private function fm_js_template_listfilename() {
private function fm_js_template_mkdir() {
$rv = '
<div class="fp-mkdir-dlg">
- <p>New folder name:</p>
- <input type="text"><br/>
+ <div class="fp-mkdir-dlg-text">New folder name:<br/><input type="text" /></div>
<a class="{!}fp-dlg-butcreate fp-panel-button" href="#">'.get_string('create').'</a>
<a class="{!}fp-dlg-butcancel fp-panel-button" href="#">'.get_string('cancel').'</a>
</div>';
@@ -383,15 +382,15 @@ private function fm_js_template_fileselectlayout() {
<tr class="{!}fp-saveas"><td class="mdl-right"><label>'.get_string('name', 'moodle').'</label>:</td>
<td class="mdl-left"><input type="text"/></td></tr>
<tr class="{!}fp-author"><td class="mdl-right"><label>'.get_string('author', 'repository').'</label>:</td>
- <td class="mdl-left"><input type="text" /></td></tr>
+ <td class="mdl-left"><input type="text"/></td></tr>
<tr class="{!}fp-license"><td class="mdl-right"><label>'.get_string('chooselicense', 'repository').'</label>:</td>
<td class="mdl-left"><select></select></td></tr>
<tr class="{!}fp-path"><td class="mdl-right"><label>'.get_string('path', 'moodle').'</label>:</td>
<td class="mdl-left"><select></select></td></tr>
<tr class="{!}fp-original"><td class="mdl-right"><label>'.get_string('original', 'repository').'</label>:</td>
- <td class="mdl-left"><span class="fp-originloading">'.$icon_progress.' '.$strloading.'</span><span class="fp-value"/></td></tr>
+ <td class="mdl-left"><span class="fp-originloading">'.$icon_progress.' '.$strloading.'</span><span class="fp-value"></span></td></tr>
<tr class="{!}fp-reflist"><td class="mdl-right"><label>'.get_string('referenceslist', 'repository').'</label>:</td>
- <td class="mdl-left"><p class="{!}fp-refcount"/><span class="fp-reflistloading">'.$icon_progress.' '.$strloading.'</span><ul class="fp-value"/></td></tr>
+ <td class="mdl-left"><p class="{!}fp-refcount"></p><span class="fp-reflistloading">'.$icon_progress.' '.$strloading.'</span><ul class="fp-value"></ul></td></tr>
</table>
</form>
<p class="{!}fp-thumbnail"></p>
@@ -402,10 +401,10 @@ private function fm_js_template_fileselectlayout() {
</p>
</form>
<div class="fp-fileinfo">
- <div class="{!}fp-datemodified">'.get_string('lastmodified', 'moodle').': <span class="fp-value"/></div>
- <div class="{!}fp-datecreated">'.get_string('datecreated', 'repository').': <span class="fp-value"/></div>
- <div class="{!}fp-size">'.get_string('size', 'repository').': <span class="fp-value"/></div>
- <div class="{!}fp-dimensions">'.get_string('dimensions', 'repository').': <span class="fp-value"/></div>
+ <div class="{!}fp-datemodified">'.get_string('lastmodified', 'moodle').': <span class="fp-value"></span></div>
+ <div class="{!}fp-datecreated">'.get_string('datecreated', 'repository').': <span class="fp-value"></span></div>
+ <div class="{!}fp-size">'.get_string('size', 'repository').': <span class="fp-value"></span></div>
+ <div class="{!}fp-dimensions">'.get_string('dimensions', 'repository').': <span class="fp-value"></span></div>
</div>
</div>';
return preg_replace('/\{\!\}/', '', $rv);
@@ -516,15 +515,15 @@ private function fp_js_template_generallayout() {
<div class="file-picker fp-generallayout">
<div class="fp-repo-area">
<ul class="fp-list">
- <li class="{!}fp-repo"><a href="#"><img class="{!}fp-repo-icon" width="16" height="16" />&nbsp;<span class="{!}fp-repo-name" /span></a></li>
+ <li class="{!}fp-repo"><a href="#"><img class="{!}fp-repo-icon" width="16" height="16" />&nbsp;<span class="{!}fp-repo-name"></span></a></li>
</ul>
</div>
<div class="fp-repo-items">
<div class="fp-navbar">
<div>
<div class="{!}fp-toolbar">
<div class="{!}fp-tb-back"><a href="#">'.get_string('back', 'repository').'</a></div>
- <div class="{!}fp-tb-search fp-search"><form/></div>
+ <div class="{!}fp-tb-search"><form></form></div>
<div class="{!}fp-tb-refresh"><a href="#"><img src="'.$this->pix_url('a/refresh').'" /></a></div>
<div class="{!}fp-tb-logout"><img src="'.$this->pix_url('a/logout').'" /><a href="#"></a></div>
<div class="{!}fp-tb-manage"><a href="#"><img src="'.$this->pix_url('a/setting').'" /> '.get_string('manageurl', 'repository').'</a></div>
@@ -535,7 +534,7 @@ private function fp_js_template_generallayout() {
<a class="{!}fp-vb-details" href="#"></a>
<a class="{!}fp-vb-tree" href="#"></a>
</div>
- <div class="fp-clear-right"></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>
@@ -691,12 +690,12 @@ private function fp_js_template_selectlayout() {
</form>
<p class="{!}fp-thumbnail"></p>
<div class="fp-fileinfo">
- <div class="{!}fp-datemodified">'.get_string('lastmodified', 'moodle').': <span class="fp-value"/></div>
- <div class="{!}fp-datecreated">'.get_string('datecreated', 'repository').': <span class="fp-value"/></div>
- <div class="{!}fp-size">'.get_string('size', 'repository').': <span class="fp-value"/></div>
- <div class="{!}fp-license">'.get_string('license', 'moodle').': <span class="fp-value"/></div>
- <div class="{!}fp-author">'.get_string('author', 'repository').': <span class="fp-value"/></div>
- <div class="{!}fp-dimensions">'.get_string('dimensions', 'repository').': <span class="fp-value"/></div>
+ <div class="{!}fp-datemodified">'.get_string('lastmodified', 'moodle').': <span class="fp-value"></span></div>
+ <div class="{!}fp-datecreated">'.get_string('datecreated', 'repository').': <span class="fp-value"></span></div>
+ <div class="{!}fp-size">'.get_string('size', 'repository').': <span class="fp-value"></span></div>
+ <div class="{!}fp-license">'.get_string('license', 'moodle').': <span class="fp-value"></span></div>
+ <div class="{!}fp-author">'.get_string('author', 'repository').': <span class="fp-value"></span></div>
+ <div class="{!}fp-dimensions">'.get_string('dimensions', 'repository').': <span class="fp-value"></span></div>
</div>
</div>';
return preg_replace('/\{\!\}/', '', $rv);
@@ -737,7 +736,7 @@ private function fp_js_template_uploadform() {
<td class="mdl-left"><input type="text"/></td></tr>
<tr class="{!}fp-setlicense">
<td class="mdl-right"><label>'.get_string('chooselicense', 'repository').'</label>:</td>
- <td class="mdl-left"><select/></td></tr>
+ <td class="mdl-left"><select></select></td></tr>
</table>
</form>
<div><button class="{!}fp-upload-btn">'.get_string('upload', 'repository').'</button></div>
@@ -772,7 +771,7 @@ private function fp_js_template_loading() {
*/
private function fp_js_template_error() {
$rv = '
-<div class="fp-content-error" ><div class="{!}fp-error" /></div>';
+<div class="fp-content-error" ><div class="{!}fp-error"></div></div>';
return preg_replace('/\{\!\}/', '', $rv);
}
@@ -818,7 +817,7 @@ private function fp_js_template_processexistingfile() {
<p class="{!}fp-dlg-text"></p>
<a class="{!}fp-dlg-butoverwrite fp-panel-button" href="#">'.get_string('overwrite', 'repository').'</a>
<a class="{!}fp-dlg-butcancel fp-panel-button" href="#">'.get_string('cancel').'</a>
- <a class="{!}fp-dlg-butrename fp-panel-button" href="#"/>
+ <a class="{!}fp-dlg-butrename fp-panel-button" href="#"></a>
</div>';
return preg_replace('/\{\!\}/', '', $rv);
}
@@ -861,11 +860,11 @@ private function fp_js_template_loginform() {
<td align="right"><label></label></td>
<td align="left"><select></select></td></tr>
<tr class="{!}fp-login-input">
- <td class="label"><label /></td>
+ <td class="label"><label></label></td>
<td class="input"><input/></td></tr>
<tr class="{!}fp-login-radiogroup">
- <td align="right" width="30%" valign="top"><label /></td>
- <td align="left" valign="top"><p class="{!}fp-login-radio"><input /> <label /></p></td></tr>
+ <td align="right" width="30%" valign="top"><label></label></td>
+ <td align="left" valign="top"><p class="{!}fp-login-radio"><input /> <label></label></p></td></tr>
</table>
<p><button class="{!}fp-login-submit">'.get_string('submit', 'repository').'</button></p>
</form>
@@ -897,7 +896,7 @@ public function filepicker_js_templates() {
* Default contents is one text input field with name="s"
*/
public function repository_default_searchform() {
- $str = '<input class="search-entry" name="s" value="Search" />';
+ $str = '<input name="s" value="Search" />';
return $str;
}
}
@@ -38,23 +38,19 @@ background: #CCC!important;filter: progid:DXImageTransform.Microsoft.gradient(st
.dir-rtl .file-picker .fp-list {text-align:right;}
.file-picker .fp-list .fp-repo a{display:block;padding:.5em .7em;}
.file-picker .fp-list .fp-repo.active {background:#F2F2F2;}
-.file-picker .fp-repo-icon {padding: 0px 7px 0px 5px;}
+.file-picker .fp-list .fp-repo-icon {padding: 0px 7px 0px 5px;}
/*
* Tools, Path & View on fp-navbar (File Picker and File Manager)
*/
-.fp-toolbar {/*display: table-row;*/display: block;line-height: 22px;float:left;}
+.fp-toolbar {display: table-row;line-height: 22px;float:left;/*display: inline-block;*/}
.fp-toolbar.empty {display:none;}
.fp-toolbar .disabled {display:none;}
.fp-toolbar div {display: inline-block;padding: 0px 2px;padding-right: 10px;}
.fp-toolbar img {vertical-align: -15%; margin-right: 5px;}
-.file-picker .search-entry {background:#FFF url('[[pix:a/search]]') no-repeat 3px 3px;height:18px;width:230px;border: 1px solid #BBB;padding-left:20px;}
+.file-picker .fp-tb-search input {background:#FFF url('[[pix:a/search]]') no-repeat 3px 3px;height:18px;width:200px;border: 1px solid #BBB;padding-left:20px;padding-top: 1px;padding-bottom: 1px;padding-right: 6px;}
-.file-picker .fp-pathbar {display: table-row;}
-.fp-pathbar .fp-path-folder {background:url('[[pix:theme|fp/path_folder]]') no-repeat 0 0;width:27px;height:12px;margin-left: 4px;}
-.fp-pathbar .fp-path-folder-name {margin-left: 32px;line-height: 20px;}
-
-.fp-viewbar {float:right;width:69px;height:22px;margin-right:8px;}
+.fp-viewbar {float:right;width:69px;height:22px;margin-right:8px;/*display: inline-block;*/}
.fp-vb-icons {background:url('[[pix:theme|fp/view_icon_active]]') no-repeat 0 0;width:22px;height:22px;display: inline-block;}
.fp-vb-icons.checked {background:url('[[pix:theme|fp/view_icon_selected]]');}
.fp-viewbar.disabled .fp-vb-icons {background:url('[[pix:theme|fp/view_icon_inactive]]');}
@@ -64,7 +60,12 @@ background: #CCC!important;filter: progid:DXImageTransform.Microsoft.gradient(st
.fp-vb-tree {background:url('[[pix:theme|fp/view_tree_active]]') no-repeat 0px 0px;width:23px;height:22px;display: inline-block;margin-left: -4px;}
.fp-vb-tree.checked {background:url('[[pix:theme|fp/view_tree_selected]]');}
.fp-viewbar.disabled .fp-vb-tree {background:url('[[pix:theme|fp/view_tree_inactive]]');}
-.file-picker .fp-clear-right {clear: right;}
+.file-picker .fp-clear-left {clear: left;}
+
+.file-picker .fp-pathbar {display: table-row;/*display: inline-block;*/}
+.fp-pathbar.empty {display: none;}
+.fp-pathbar .fp-path-folder {background:url('[[pix:theme|fp/path_folder]]') no-repeat 0 0;width:27px;height:12px;margin-left: 4px;}
+.fp-pathbar .fp-path-folder-name {margin-left: 32px;line-height: 20px;}
/*
* Icon view (File Picker and File Manager)
@@ -316,9 +317,8 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
/*
* Create folder dialogue (File Manager only)
*/
-.filemanager.fp-mkdir-dlg {text-align: center;z-index: 999999}
-.filemanager .fp-mkdir-dlg p {text-align: left;margin: 40px 20px 0px;}
-.filemanager .fp-mkdir-dlg input {margin: 0px 20px 20px;}
+.filemanager .fp-mkdir-dlg {text-align: center;}
+.filemanager .fp-mkdir-dlg .fp-mkdir-dlg-text {text-align: left;margin: 40px 20px 20px;}
/*
* Confirm dialogue for delete (File Manager only)

0 comments on commit 6077e38

Please sign in to comment.