Skip to content

Commit

Permalink
Merge branch 'wip-MDL-33130-master' of https://github.com/barbararami…
Browse files Browse the repository at this point in the history 
…ro/moodle

Conflicts:
	theme/base/style/core.css
	theme/base/style/filemanager.css
  • Loading branch information
Aparup Banerjee committed Jun 19, 2012
2 parents 139d363 + af9c48c commit 9e4d54e
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 67 deletions.
86 changes: 45 additions & 41 deletions files/renderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,8 @@ private function fm_js_template_mkdir() {
$rv = '
<div class="filemanager fp-mkdir-dlg">
<div class="fp-mkdir-dlg-text">'.get_string('newfoldername','repository').'<br/><input type="text" /></div>
<a class="{!}fp-dlg-butcreate fp-panel-button" href="#">'.get_string('makeafolder').'</a>
<a class="{!}fp-dlg-butcancel fp-panel-button" href="#">'.get_string('cancel').'</a>
<button class="{!}fp-dlg-butcreate">'.get_string('makeafolder').'</button>
<button class="{!}fp-dlg-butcancel">'.get_string('cancel').'</button>
</div>';
return preg_replace('/\{\!\}/', '', $rv);
}
Expand Down Expand Up @@ -370,12 +370,11 @@ private function fm_js_template_fileselectlayout() {
<p>'.get_string('loading', 'repository').'</p>
</div>
<form>
<div><a class="{!}fp-file-download fp-panel-button" href="#">'.get_string('download').'</a>
<a class="{!}fp-file-delete fp-panel-button" href="#">'.get_string('delete').'</a>
<a class="{!}fp-file-setmain fp-panel-button" href="#">'.get_string('setmainfile', 'repository').'</a>
<a class="{!}fp-file-zip fp-panel-button" href="#">'.get_string('zip', 'editor').'</a>
<a class="{!}fp-file-unzip fp-panel-button" href="#">'.get_string('unzip').'</a>
</div>
<button class="{!}fp-file-download">'.get_string('download').'</button>
<button class="{!}fp-file-delete">'.get_string('delete').'</button>
<button class="{!}fp-file-setmain">'.get_string('setmainfile', 'repository').'</button>
<button class="{!}fp-file-zip">'.get_string('zip', 'editor').'</button>
<button class="{!}fp-file-unzip">'.get_string('unzip').'</button>
<div class="fp-hr"></div>
<table>
<tr class="{!}fp-saveas"><td class="mdl-right"><label>'.get_string('name', 'moodle').'</label>:</td>
Expand All @@ -391,19 +390,20 @@ private function fm_js_template_fileselectlayout() {
<tr class="{!}fp-reflist"><td class="mdl-right"><label>'.get_string('referenceslist', 'repository').'</label>:</td>
<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>
<form>
<p class="fp-select-update">
<a class="{!}fp-file-update" href="#"><span>'.get_string('update', 'moodle').'</span></a>
<a class="{!}fp-file-cancel" href="#"><span>'.get_string('cancel').'</span></a>
</p>
</form>
<div class="fp-fileinfo">
<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 class="fp-select-buttons">
<button class="{!}fp-file-update">'.get_string('update', 'moodle').'</button>
<button class="{!}fp-file-cancel">'.get_string('cancel').'</button>
</div>
</form>
<div class="fp-info">
<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-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>
</div>';
return preg_replace('/\{\!\}/', '', $rv);
Expand All @@ -424,8 +424,8 @@ private function fm_js_template_confirmdialog() {
$rv = '
<div class="filemanager fp-dlg">
<div class="{!}fp-dlg-text"></div>
<a class="{!}fp-dlg-butconfirm fp-panel-button" href="#">'.get_string('ok').'</a>
<a class="{!}fp-dlg-butcancel fp-panel-button" href="#">'.get_string('cancel').'</a>
<button class="{!}fp-dlg-butconfirm">'.get_string('delete').'</button>
<button class="{!}fp-dlg-butcancel">'.get_string('cancel').'</button>
</div>';
return preg_replace('/\{\!\}/', '', $rv);
}
Expand Down Expand Up @@ -661,11 +661,6 @@ private function fp_js_template_selectlayout() {
<p>'.get_string('loading', 'repository').'</p>
</div>
<form>
<div>
<a class="{!}fp-select-confirm fp-panel-button" href="#">'.get_string('getfile', 'repository').'</a>
<a class="{!}fp-select-cancel fp-panel-button" href="#">'.get_string('cancel').'</a>
</div>
<div class="fp-hr"></div>
<table>
<tr class="{!}fp-linktype-2">
<td></td>
Expand All @@ -686,16 +681,23 @@ private function fp_js_template_selectlayout() {
<td class="mdl-right"><label>'.get_string('chooselicense', 'repository').'</label>:</td>
<td class="mdl-left"><select></select></td></tr>
</table>
<div class="fp-select-buttons">
<button class="{!}fp-select-confirm">'.get_string('getfile', 'repository').'</button>
<button class="{!}fp-select-cancel">'.get_string('cancel').'</button>
</div>
</form>
<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-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 class="fp-info">
<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-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>
</div>';
return preg_replace('/\{\!\}/', '', $rv);
}
Expand Down Expand Up @@ -791,7 +793,7 @@ private function fp_js_template_message() {
$rv = '
<div class="file-picker fp-msg">
<p class="{!}fp-msg-text"></p>
<a class="{!}fp-msg-butok fp-panel-button" href="#">'.get_string('ok').'</a>
<button class="{!}fp-msg-butok">'.get_string('ok').'</button>
</div>';
return preg_replace('/\{\!\}/', '', $rv);
}
Expand All @@ -815,9 +817,11 @@ private function fp_js_template_processexistingfile() {
$rv = '
<div class="file-picker fp-dlg">
<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>
<div class="fp-dlg-buttons">
<button class="{!}fp-dlg-butoverwrite">'.get_string('overwrite', 'repository').'</button>
<button class="{!}fp-dlg-butrename"></button>
<button class="{!}fp-dlg-butcancel">'.get_string('cancel').'</button>
</div>
</div>';
return preg_replace('/\{\!\}/', '', $rv);
}
Expand Down
4 changes: 2 additions & 2 deletions theme/base/style/core.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ sup {vertical-align: super;}
bottom: 0px;
left: 18.5em;
margin: 0;
padding: 2em 2em 2em 2.4em;
padding: 1.6em;
background-color: #FFFFFF;
overflow-x: hidden;
overflow-y: auto;
Expand All @@ -961,4 +961,4 @@ sup {vertical-align: super;}
-moz-box-shadow: 0px 0px 10px 0px #CCCCCC;
}

.initialbar a {padding-right: 2px;}
.initialbar a {padding-right: 2px;}
30 changes: 15 additions & 15 deletions theme/base/style/filemanager.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.filemanager, .file-picker {font-size:11px;color: #555555;letter-spacing: .2px;}
.filemanager a, .file-picker a {color:#555555;}
.filemanager a:hover, .file-picker a:hover {color:#555555;text-decoration: none;}
.filemanager select, .filemanager input, .filemanagerbutton, .filemanager textarea,
.filemanager select, .filemanager input, .filemanager button, .filemanager textarea,
.file-picker select, .file-picker input, .file-picker button, .file-picker textarea {color:#555555; letter-spacing: .2px;}
.filemanager input[type="text"], .file-picker input[type="text"] {border: 1px solid #BBBBBB;width: 265px;height: 18px;padding: 1px 6px;}
.filemanager select, .file-picker select {height: 22px;padding: 2px 1px;}
Expand Down Expand Up @@ -63,7 +63,7 @@ background: #CCCCCC;filter: progid:DXImageTransform.Microsoft.gradient(startColo
/*
* Tools, Path & View on fp-navbar (File Picker and File Manager)
*/
.fp-toolbar {display: table-row;line-height: 22px;float:left;/*display: inline-block;*/}
.fp-toolbar {display: table-row;line-height: 22px;float:left;}

.dir-rtl .fp-toolbar {float: right;}

Expand All @@ -76,7 +76,7 @@ background: #CCCCCC;filter: progid:DXImageTransform.Microsoft.gradient(startColo
.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-viewbar {float:right;width:69px;height:22px;margin-right:8px;/*display: inline-block;*/}
.fp-viewbar {float:right;width:69px;height:22px;margin-right:8px;}
.dir-rtl .fp-toolbar img {vertical-align: -35%;}
.dir-rtl .fp-viewbar {float: left;width: 100px;}

Expand Down Expand Up @@ -105,7 +105,7 @@ background: #CCCCCC;filter: progid:DXImageTransform.Microsoft.gradient(startColo
.dir-rtl .fp-vb-tree a:hover {background:none; border:30px solid black}
.dir-rtl .fp-vb-tree.checked a:hover {background:none; border:50px solid black}

.file-picker .fp-pathbar {display: table-row;/*display: inline-block;*/}
.file-picker .fp-pathbar {display: table-row;}
.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;}
.dir-rtl .fp-pathbar .fp-path-folder {background:url('[[pix:theme|fp/path_folder_rtl]]') no-repeat right top;width:auto;height:12px;margin-left: 4px;}
Expand Down Expand Up @@ -209,7 +209,8 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
* File exists dialogue on Upload (File Picker only)
*/
.file-picker.fp-dlg {text-align: center;}
.file-picker.fp-dlg .fp-dlg-text {padding: 40px 20px 10px 20px;font-size: 12px;}
.file-picker.fp-dlg .fp-dlg-text {padding: 30px 20px 10px;font-size: 12px;}
.file-picker.fp-dlg .fp-dlg-buttons {margin: 0 20px;}

/*
* Error dialogue on Upload (File Picker only)
Expand Down Expand Up @@ -237,18 +238,17 @@ 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: 5px 20px;}
.fp-select table {margin: 10px 20px;}
.fp-select-update {float:right;margin-right: 20px;}
.fp-select .fp-file-update {background:url('[[pix:theme|fp/check]]') no-repeat left center;width:17px;height:17px;}
.fp-select .fp-file-cancel {background:url('[[pix:theme|fp/cross]]') no-repeat left center;width:17px;height:17px;margin-left: 25px;}
.fp-select .fp-select-update span {margin-left: 17px;}
.fp-select .fp-thumbnail {float:left;min-width:110px;min-height:110px;line-height: 110px;text-align: center;margin: 10px 20px 0px 20px;background: #FFFFFF;border: 1px solid #DDDDDD;-webkit-box-shadow: inset 0px 0px 10px 0px #CCCCCC;-moz-box-shadow: inset 0px 0px 10px 0px #CCCCCC;box-shadow: inset 0px 0px 10px 0px #CCCCCC;}
.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 .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 img {border: 1px solid #DDDDDD;padding:3px;vertical-align: middle;margin: 10px;}
.fp-select .fp-fileinfo {display: inline-block;margin-top: 4px;margin-right: 20px;}
.fp-select .fp-fileinfo {display: inline-block;margin-top: 10px;}
.file-picker.fp-select .fp-fileinfo {max-width:240px;}
.fp-select .fp-fileinfo div {padding: 4px 0px;}
.fp-select .fp-fileinfo div {padding-bottom: 5px;}

.file-picker.fp-select .uneditable {display:none;}
.file-picker.fp-select .fp-select-loading {display:none;}
Expand Down Expand Up @@ -371,7 +371,7 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
* Create folder dialogue (File Manager only)
*/
.filemanager.fp-mkdir-dlg {text-align: center;}
.filemanager.fp-mkdir-dlg .fp-mkdir-dlg-text {text-align: left;margin: 40px 20px 20px;}
.filemanager.fp-mkdir-dlg .fp-mkdir-dlg-text {text-align: left;margin: 20px;}

.dir-rtl .filemanager .fp-mkdir-dlg p {text-align: right;}

Expand Down
18 changes: 11 additions & 7 deletions theme/base/style/question.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,18 @@
#qtypechoicecontainer {display: none;}
body.jsenabled #qtypechoicecontainer {display: block;}

#qtypechoicecontainer {background: white;}
#qtypechoicecontainer #chooseqtype {width: 30em;}
#qtypechoicecontainer #chooseqtypehead h3 {margin: 0;}
#qtypechoicecontainer #chooseqtype .qtypes {position: relative;border-bottom: 1px solid grey;padding: 0.24em 0;}
#qtypechoicecontainer #chooseqtype .qtypeoption {margin-bottom: 0; padding: 0.2em 0 0.2em 0.3em;}
#qtypechoicecontainer #chooseqtype .qtypeoption img {vertical-align: middle;}
#qtypechoicecontainer_c.yui-panel-container.shadow .underlay {background: none;}
#qtypechoicecontainer.yui-panel .hd {color:#333333;letter-spacing: 1px;text-shadow: 1px 1px 1px #FFFFFF;border-radius: 10px 10px 0 0;border: 1px solid #CCCCCC;border-bottom: 1px solid #BBBBBB;background: -webkit-gradient(linear, left top, left bottom, from(#FFFFFF), to(#CCCCCC));background: -moz-linear-gradient(top, #FFFFFF, #CCCCCC);}

#qtypechoicecontainer {font-size: 12px;color: #333333;background: #F2F2F2;border-radius: 10px;border:1px solid #CCCCCC;border-top:0 none;-webkit-box-shadow: 5px 5px 20px 0px #666666;-moz-box-shadow: 5px 5px 20px 0px #666666;box-shadow: 5px 5px 20px 0px #666666;}
#qtypechoicecontainer #chooseqtype {width: 35em;}
#qtypechoicecontainer #chooseqtypehead h3 {margin: 0;font-weight: normal;}
#qtypechoicecontainer #chooseqtype .qtypes {position: relative;border-bottom: 1px solid #BBBBBB;padding: 0.24em 0;}
#qtypechoicecontainer #chooseqtype .qtypeoption {margin-bottom: 0; padding: 0.3em 0 0.3em 1.6em;}
#qtypechoicecontainer #chooseqtype .qtypeoption img {vertical-align: middle;padding-left: 1em;padding-right: 0.5em;}
#qtypechoicecontainer #chooseqtype .selected {background-color: #FFFFFF;box-shadow: 0px 0px 10px 0px #CCCCCC;-webkit-box-shadow: 0px 0px 10px 0px #CCCCCC;-moz-box-shadow: 0px 0px 10px 0px #CCCCCC;}
#qtypechoicecontainer #chooseqtype .instruction,
#qtypechoicecontainer #chooseqtype .qtypesummary {display: none;position: absolute;top: 0px;right: 0px;bottom: 0px;left: 60%;margin: 0;border-left: 1px solid grey;padding: 0.3em 0.5em;background-color: white;}
#qtypechoicecontainer #chooseqtype .qtypesummary {display: none;position: absolute;top: 0px;right: 0px;bottom: 0px;left: 60%;margin: 0;padding: 1.5em 1.6em;background-color: #FFFFFF;}
#qtypechoicecontainer #chooseqtype .instruction,
#qtypechoicecontainer #chooseqtype .selected .qtypesummary {display: block;}

Expand Down
2 changes: 0 additions & 2 deletions theme/standard/style/question.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
#chooseqtype .qtypename {font-weight: bold;}

#qtypechoicecontainer #chooseqtype .qtypename {font-weight: normal;}
#qtypechoicecontainer #chooseqtype .qtypes {border-bottom-color: gray;}
#qtypechoicecontainer #chooseqtype .selected {background: #dddddd;}
#qtypechoicecontainer #chooseqtype .instruction,
#qtypechoicecontainer #chooseqtype .qtypesummary {border-left-color: gray;}

Expand Down

0 comments on commit 9e4d54e

Please sign in to comment.