Permalink
Browse files

MDL-33542, MDL-33542 Select dialogue details aligned

And loading gif smaller
  • Loading branch information...
1 parent a079d36 commit 19ef00b9166a4f49200976fd204c951e1d747f34 @barbararamiro barbararamiro committed with danpoltawski Jul 4, 2012
Showing with 13 additions and 14 deletions.
  1. +8 −12 files/renderer.php
  2. +5 −2 theme/base/style/filemanager.css
View
@@ -229,7 +229,7 @@ private function fm_print_generallayout($fm) {
<div class="filemanager-container"'.$containerstyletag.'>
<div class="fm-content-wrapper">
<div class="fp-content"></div>
- <div class="fm-empty-container <!--mdl-align-->">
+ <div class="fm-empty-container">
<span class="dndupload-message">'.$strdndenabledinbox.'<br/><span class="dndupload-arrow"></span></span>
</div>
<div class="dndupload-target">'.$strdroptoupload.'<br/><span class="dndupload-arrow"></span></div>
@@ -379,8 +379,7 @@ private function fm_js_template_fileselectlayout() {
$rv = '
<div class="filemanager fp-select">
<div class="fp-select-loading">
- <img src="'.$this->pix_url('i/loading').'" />
- <p>'.get_string('loading', 'repository').'</p>
+ <img src="'.$this->pix_url('i/loading_small').'" />
</div>
<form>
<button class="{!}fp-file-download">'.get_string('download').'</button>
@@ -633,8 +632,7 @@ private function fp_js_template_nextpage() {
<div class="{!}fp-nextpage">
<div class="fp-nextpage-link"><a href="#">'.get_string('more').'</a></div>
<div class="fp-nextpage-loading">
- <img src="'.$this->pix_url('i/loading').'" />
- <p>'.get_string('loading', 'repository').'</p>
+ <img src="'.$this->pix_url('i/loading_small').'" />
</div>
</div>';
return preg_replace('/\{\!\}/', '', $rv);
@@ -672,19 +670,18 @@ private function fp_js_template_selectlayout() {
$rv = '
<div class="file-picker fp-select">
<div class="fp-select-loading">
- <img src="'.$this->pix_url('i/loading').'" />
- <p>'.get_string('loading', 'repository').'</p>
+ <img src="'.$this->pix_url('i/loading_small').'" />
</div>
<form>
<table>
<tr class="{!}fp-linktype-2">
- <td></td>
+ <td class="mdl-right"></td>
<td class="mdl-left"><input type="radio"/><label>&nbsp;'.get_string('makefileinternal', 'repository').'</label></td></tr>
<tr class="{!}fp-linktype-1">
- <td></td>
+ <td class="mdl-right"></td>
<td class="mdl-left"><input type="radio"/><label>&nbsp;'.get_string('makefilelink', 'repository').'</label></td></tr>
<tr class="{!}fp-linktype-4">
- <td></td>
+ <td class="mdl-right"></td>
<td class="mdl-left"><input type="radio"/><label>&nbsp;'.get_string('makefilereference', 'repository').'</label></td></tr>
<tr class="{!}fp-saveas">
<td class="mdl-right"><label>'.get_string('saveas', 'repository').'</label>:</td>
@@ -770,8 +767,7 @@ private function fp_js_template_loading() {
return '
<div class="fp-content-loading">
<div class="fp-content-center">
- <img src="'.$this->pix_url('i/loading').'" />
- <p>'.get_string('loading', 'repository').'</p>
+ <img src="'.$this->pix_url('i/loading_small').'" />
</div>
</div>';
}
@@ -241,6 +241,8 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
.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;}
.fp-select table {padding: 0 0 10px;}
+.fp-select table .mdl-right {min-width: 84px;}
+.fp-select .fp-reflist .mdl-right {vertical-align: top;}
.fp-select .fp-select-buttons {float: right;}
.fp-select .fp-info {display: block;clear: both;padding: 1px 20px 0;}
.fp-select .fp-thumbnail {float:left;min-width:110px;min-height:110px;line-height: 110px;text-align: center;margin: 10px 20px 0 0;background: #FFFFFF;border: 1px solid #DDDDDD;-webkit-box-shadow: inset 0 0 10px 0 #CCCCCC;-moz-box-shadow: inset 0 0 10px 0 #CCCCCC;box-shadow: inset 0 0 10px 0 #CCCCCC;}
@@ -253,6 +255,7 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
.file-picker.fp-select .fp-select-loading {display:none;}
.file-picker.fp-select.loading .fp-select-loading {display:block;}
.file-picker.fp-select.loading form {display:none;}
+.fp-select .fp-dimensions.fp-unknown {display: none;}
/*
* File Manager
@@ -269,7 +272,7 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
.filemanager .fm-empty-container {display:none;}
.filemanager.fm-noitems .filemanager-container .fp-content {display:none;}
.filemanager .filemanager-updating {display:none;text-align:center;}
-.filemanager.fm-updating .filemanager-updating {display:block;}
+.filemanager.fm-updating .filemanager-updating {display:block;margin-top: 37px;}
.filemanager.fm-updating .fm-content-wrapper {display:none;}
.filemanager.fm-nomkdir .fp-btn-mkdir {display:none;}
@@ -368,7 +371,7 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
.filemanager.fp-select .fp-reflist .fp-reflistloading {display:none;}
.filemanager.fp-select .fp-refcount {max-width: 265px;}
.filemanager.fp-select .fp-reflist.fp-loading .fp-reflistloading {display:inline;}
-.filemanager.fp-select .fp-reflist .fp-value {background: #FFFFFF;border: 1px solid #BBBBBB;padding: 8px 7px;margin: 0px;max-width: 265px;max-height: 75px;overflow:auto;}
+.filemanager.fp-select .fp-reflist .fp-value {background: #F9F9F9;border: 1px solid #BBBBBB;padding: 8px 7px;margin: 0px;max-width: 265px;max-height: 75px;overflow:auto;}
.filemanager.fp-select .fp-reflist .fp-value li {padding-bottom: 7px;}
/*

0 comments on commit 19ef00b

Please sign in to comment.