Skip to content

Commit

Permalink
Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle
Browse files Browse the repository at this point in the history 
Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information
@marinaglancy
marinaglancy committed Apr 8, 2014
2 parents 0610d2c + 0d5bfb9 commit d175d25
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 19 deletions.
22 changes: 11 additions & 11 deletions files/renderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,21 +744,21 @@ private function fp_js_template_selectlayout() {
</div>
<form class="form-horizontal">
<div class="fp-forminset">
<div class="fp-linktype-2 control-group clearfix">
<label class="control-label">'.get_string('makefileinternal', 'repository').'</label>
<div class="controls">
<div class="fp-linktype-2 control-group control-radio clearfix">
<label class="control-label control-radio">'.get_string('makefileinternal', 'repository').'</label>
<div class="controls control-radio">
<input type="radio"/>
</div>
</div>
<div class="fp-linktype-1 control-group clearfix">
<label class="control-label">'.get_string('makefilelink', 'repository').'</label>
<div class="controls">
<div class="fp-linktype-1 control-group control-radio clearfix">
<label class="control-label control-radio">'.get_string('makefilelink', 'repository').'</label>
<div class="controls control-radio">
<input type="radio"/>
</div>
</div>
<div class="fp-linktype-4 control-group clearfix">
<label class="control-label">'.get_string('makefilereference', 'repository').'</label>
<div class="controls">
<div class="fp-linktype-4 control-group control-radio clearfix">
<label class="control-label control-radio">'.get_string('makefilereference', 'repository').'</label>
<div class="controls control-radio">
<input type="radio"/>
</div>
</div>
Expand Down Expand Up @@ -790,10 +790,10 @@ private function fp_js_template_selectlayout() {
<div class="fp-hr"></div>
<p class="fp-thumbnail"></p>
<div class="fp-fileinfo">
<div class="fp-datemodified">'.get_string('lastmodified', 'moodle').'<span class="fp-value"></span></div>
<div class="fp-datemodified">'.get_string('lastmodified', 'repository').'<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-license">'.get_string('license', 'repository').'<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>
Expand Down
1 change: 1 addition & 0 deletions lang/en/repository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
$string['isactive'] = 'Active?';
$string['keyword'] = 'Keyword';
$string['lastmodified'] = 'Last modified:';
$string['license'] = 'License:';
$string['linkexternal'] = 'Link external';
$string['listview'] = 'View as list';
$string['loading'] = 'Loading...';
Expand Down
19 changes: 15 additions & 4 deletions theme/base/style/filemanager.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ a.ygtvspacer:hover {color:transparent;text-decoration:none;}
.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;}
.fp-select .fp-thumbnail {float:left;min-width:110px;min-height:110px;line-height:110px;text-align:center;margin:10px 10px 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;}
.fp-select .fp-thumbnail img {border:1px solid #DDDDDD;padding:3px;vertical-align:middle;margin:10px;}
.fp-select .fp-fileinfo {display:inline-block;margin-top:10px;}
.file-picker.fp-select .fp-fileinfo {max-width:240px;}
Expand Down Expand Up @@ -432,15 +432,26 @@ a.ygtvspacer:hover {color:transparent;text-decoration:none;}
.fp-formset label {display:block;float:left;width:210px;text-align:right;margin:0 10px 0 0;}
.fp-formset .fp-popup { text-align: center; }
.fp-formset .fp-setlicense select {width:280px;}
.fp-forminset { margin-bottom: 10px; }
.fp-forminset label {display:block;float:left;width:95px;text-align:right;margin:0 10px 0 0;}
.fp-forminset input[type="text"] { width: 258px; margin: 0; }
.fp-forminset select { width: 272px; margin: 0; }
.fp-forminset .controls {float:left;}
.fp-forminset label.control-radio { float: right; text-align: left; width: 250px; }
.fp-forminset .controls.control-radio { margin-left: 105px; }
.fp-forminset .controls.control-radio input { margin-top: 5px; }
.file-picker .fp-fileinfo .fp-value { display: inline-block; padding-left: 5px; }
.dir-rtl .fp-forminset label {display:block;float:right;width:95px;text-align:right;margin:0 0 0 10px;}
.dir-rtl .fp-forminset .controls {float:right;}
.dir-rtl .fp-forminset .fp-select-buttons {float:left;}
.dir-rtl .fp-forminset .fp-setlicense select, .dir-rtl .fp-forminset .fp-license select {width:248px;}
.dir-rtl .fp-formset label {float:right;text-align:left; margin:0 0 0 10px;}
.dir-rtl .fp-forminset .fp-setlicense select, .dir-rtl .fp-forminset .fp-license select {width:272px;}
.dir-rtl .fp-forminset input[type="text"] { width: 258px; margin: 0; }
.dir-rtl .fp-forminset label.control-radio { float: left; text-align: right; width: 250px; margin-left: 0; }
.dir-rtl .fp-forminset .controls.control-radio { margin: 0 100px 0 0; }
.dir-rtl .fp-select .fp-thumbnail { margin-right: 0;}
.dir-rtl .file-picker .fp-fileinfo .fp-value { display: inline-block; padding: 0 5px 0 0; }
.dir-rtl .fp-formset div {text-align:right;}

.dir-rtl .fp-formset label {float:right;text-align:left; margin:0 0 0 10px;}
/**
* Responsive styles for the filepicker
*/
Expand Down
37 changes: 34 additions & 3 deletions theme/bootstrapbase/less/moodle/filemanager.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1204,21 +1204,39 @@ a.ygtvspacer:hover {
line-height: inherit;
}
}
.fp-forminset {
.fp-forminset {
max-width: 400px;
padding: 10px;
padding: 0 10px;
.control-group.control-radio {
margin-bottom: 0;
}
.control-group {
label.control-label {
width: 105px;
}
label.control-radio {
float: right;
text-align: left;
width: 215px;
}
.controls {
margin-left: 125px;
}
.controls.control-radio input {
margin-top: 3px;
}
}
.fp-select-buttons {
float: none;
}
input[type="text"] {
width: 228px;
}
}

.fp-fileinfo .fp-value {
display: inline-block;
padding-left: 5px;
}

.dir-rtl .fp-forminset {
Expand All @@ -1228,6 +1246,11 @@ a.ygtvspacer:hover {
float: right;
text-align: left;
}
label.control-radio {
float: left;
text-align: right;
width: 215px;
}
.controls {
margin-left: 0;
margin-right: 125px;
Expand All @@ -1237,10 +1260,18 @@ a.ygtvspacer:hover {
float: left;
}
input[type="text"] {
width: 248px;
width: 228px;
}
}

.dir-rtl .fp-fileinfo .fp-value {
display: inline-block;
padding-right: 5px;
}
.dir-rtl .fp-select .fp-thumbnail {
margin: 10px 0 0 0px;
}

.dir-rtl .filepicker .fp-formset {
label {
float: right;
Expand Down
2 changes: 1 addition & 1 deletion theme/bootstrapbase/style/moodle.css
View file

Large diffs are not rendered by default.

0 comments on commit d175d25

Please sign in to comment.