Skip to content

Commit

Permalink
MDL-42236 Filepicker: fixing search box for repositories
Browse files Browse the repository at this point in the history
Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information
jsnfwlr authored and Sam Hemelryk committed Nov 1, 2013
1 parent 9620bce commit 98719c4
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 19 deletions.
2 changes: 1 addition & 1 deletion files/renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ private function fp_js_template_generallayout() {
<div class="{!}fp-tb-back"><a href="#">'.get_string('back', 'repository').'</a></div>
<div class="{!}fp-tb-search"><form></form></div>
<div class="{!}fp-tb-refresh"><a href="#"><img alt="'. get_string('refresh', 'repository') .'" src="'.$this->pix_url('a/refresh').'" /></a></div>
<div class="{!}fp-tb-logout"><img alt="'. get_string('logout', 'repository') .'" src="'.$this->pix_url('a/logout').'" /><a href="#"></a></div>
<div class="{!}fp-tb-logout"><a href="#"><img alt="'. get_string('logout', 'repository') .'" src="'.$this->pix_url('a/logout').'" /></a></div>
<div class="{!}fp-tb-manage"><a href="#"><img alt="'. get_string('settings', 'repository') .'" src="'.$this->pix_url('a/setting').'" /></a></div>
<div class="{!}fp-tb-help"><a href="#"><img alt="'. get_string('help', 'repository') .'" src="'.$this->pix_url('a/help').'" /></a></div>
<div class="{!}fp-tb-message"></div>
Expand Down
4 changes: 0 additions & 4 deletions repository/filepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -1855,10 +1855,6 @@ M.core_filepicker.init = function(Y, options) {

// login button
enable_tb_control(toolbar.one('.fp-tb-logout'), !r.nologin);
if (!r.nologin) {
var label = r.logouttext ? r.logouttext : M.str.repository.logout;
toolbar.one('.fp-tb-logout').one('a,button').setContent(label)
}

// manage url
enable_tb_control(toolbar.one('.fp-tb-manage'), r.manage);
Expand Down
10 changes: 6 additions & 4 deletions theme/base/style/filemanager.css
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,11 @@ background:#E2E2E2;filter:progid:DXImageTransform.Microsoft.gradient(startColors
.dir-rtl .fp-navbar .filemanager-toolbar .fp-toolbar div {margin:9px 9px 9px 0;}
.file-picker .fp-toolbar div.disabled {display:none;}
.fp-toolbar img {vertical-align:-15%;margin:7px 12px;}
.fp-toolbar .fp-tb-search {width:228px;height:14px;}
.fp-toolbar .fp-tb-search input {background:#FFFFFF url('[[pix:a/search]]') no-repeat 3px 3px;padding:2px 6px 1px 20px;width:200px;height:16px;border:1px solid #BBBBBB;}
.fp-navbar .filemanager-toolbar .fp-toolbar
.file-picker .fp-toolbar .fp-tb-search {width:235px;height:30px;}
.file-picker .fp-toolbar .fp-tb-search .fp-def-search {border:0;background:transparent;margin:0;padding:0;width:235px;}
.dir-rtl .file-picker .fp-toolbar .fp-tb-search {width:242px;}
.dir-rtl .file-picker .fp-toolbar .fp-tb-search .fp-def-search {width:242px;}
.fp-toolbar .fp-tb-search input {background:transparent url('[[pix:a/search]]') no-repeat 7px 7px;padding:2px 6px 1px 27px;width:210px;height:27px;border:0;}
.dir-rtl .fp-toolbar img {vertical-align:-35%;}
.dir-rtl .file-picker .fp-viewbar, .dir-rtl .fp-navbar .filemanager-toolbar .fp-viewbar {float:left;}
.dir-rtl .file-picker .fp-viewbar {margin-left:0;}
Expand Down Expand Up @@ -282,7 +284,7 @@ a.ygtvspacer:hover {color:transparent;text-decoration:none;}
*/
.fp-restrictions{text-align:right;}
.filemanager .fp-navbar {background:#F2F2F2;border-top:1px solid #BBBBBB;border-left:1px solid #BBBBBB;border-right:1px solid #BBBBBB;}
.filemanager-toolbar{min-height:48px;}
.filemanager-toolbar {min-height:50px;}
.fp-pathbar {border-top:1px solid #BBBBBB;padding:5px 8px 1px;min-height:20px;}

.filemanager .fp-pathbar.empty {display:none;}
Expand Down
17 changes: 8 additions & 9 deletions theme/bootstrapbase/less/moodle/filemanager.less
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,6 @@
.filepicker.moodle-dialogue-fullscreen .file-picker .fp-content {
width: 100%;
}
.dir-rtl .file-picker .fp-repo-items {
margin-right: 181px;
}
.file-picker .fp-content-loading {
height: 100%;
width: 100%;
Expand All @@ -137,7 +134,7 @@
text-align: right;
}
.dir-rtl .file-picker .fp-toolbar {
padding: 0;
padding: 9px;
}
.dir-rtl .file-picker .fp-list {
text-align: right;
Expand Down Expand Up @@ -198,6 +195,7 @@
.fp-toolbar.empty {
display: none;
}
.dir-rtl .fp-toolbar div.disabled,
.fp-toolbar .disabled {
display: none;
}
Expand All @@ -210,20 +208,21 @@
display: block;
float: right;
margin-left: 9px;
margin-right: 0px;
}
.fp-toolbar img {
vertical-align: -15%;
margin-right: 5px;
}
.fp-toolbar .fp-tb-search {
width: 228px;
height: 14px;
width: 235px;
height: 27px;
}
.fp-toolbar .fp-tb-search input {
background: #FFFFFF url('[[pix:a/search]]') no-repeat 3px 3px;
padding: 2px 6px 1px 20px;
background: #FFFFFF url('[[pix:a/search]]') no-repeat 7px 7px;
padding: 2px 6px 1px 27px;
width: 200px;
height: 16px;
height: 27px;
border: 1px solid #BBBBBB;
}
.fp-viewbar {
Expand Down
2 changes: 1 addition & 1 deletion theme/bootstrapbase/style/moodle.css

Large diffs are not rendered by default.

0 comments on commit 98719c4

Please sign in to comment.