From af9c48cbe9bbfef2e71623dd282fa0c74ae66a2b Mon Sep 17 00:00:00 2001 From: Barbara Ramiro Date: Tue, 19 Jun 2012 14:36:13 +0800 Subject: [PATCH] MDL-33130 Filemanager/Filepicker buttons, Activitity Chooser and Quiz revised to look consistent --- files/renderer.php | 86 ++++++++++++++++--------------- theme/base/style/core.css | 5 +- theme/base/style/filemanager.css | 30 +++++------ theme/base/style/question.css | 18 ++++--- theme/standard/style/question.css | 2 - 5 files changed, 73 insertions(+), 68 deletions(-) diff --git a/files/renderer.php b/files/renderer.php index 2f5f5d41221..978fcb029a3 100644 --- a/files/renderer.php +++ b/files/renderer.php @@ -303,8 +303,8 @@ class core_files_renderer extends plugin_renderer_base { $rv = '
'.get_string('newfoldername','repository').'
- '.get_string('makeafolder').' - '.get_string('cancel').' + +
'; return preg_replace('/\{\!\}/', '', $rv); } @@ -370,12 +370,11 @@ class core_files_renderer extends plugin_renderer_base {

'.get_string('loading', 'repository').'

-
'.get_string('download').' - '.get_string('delete').' - '.get_string('setmainfile', 'repository').' - '.get_string('zip', 'editor').' - '.get_string('unzip').' -
+ + + + +
@@ -391,19 +390,20 @@ class core_files_renderer extends plugin_renderer_base {
:
:

'.$icon_progress.' '.$strloading.'
    -
    -

    -
    -

    - '.get_string('update', 'moodle').' - '.get_string('cancel').' -

    -
    -
    -
    '.get_string('lastmodified', 'moodle').':
    -
    '.get_string('datecreated', 'repository').':
    -
    '.get_string('size', 'repository').':
    -
    '.get_string('dimensions', 'repository').':
    +
    + + +
    + +
    +
    +

    +
    +
    '.get_string('lastmodified', 'moodle').':
    +
    '.get_string('datecreated', 'repository').':
    +
    '.get_string('size', 'repository').':
    +
    '.get_string('dimensions', 'repository').':
    +
    '; return preg_replace('/\{\!\}/', '', $rv); @@ -424,8 +424,8 @@ class core_files_renderer extends plugin_renderer_base { $rv = '
    - '.get_string('ok').' - '.get_string('cancel').' + +
    '; return preg_replace('/\{\!\}/', '', $rv); } @@ -661,11 +661,6 @@ class core_files_renderer extends plugin_renderer_base {

    '.get_string('loading', 'repository').'

    -
    - '.get_string('getfile', 'repository').' - '.get_string('cancel').' -
    -
    @@ -686,16 +681,23 @@ class core_files_renderer extends plugin_renderer_base {
    :
    +
    + + +
    -

    -
    -
    '.get_string('lastmodified', 'moodle').':
    -
    '.get_string('datecreated', 'repository').':
    -
    '.get_string('size', 'repository').':
    -
    '.get_string('license', 'moodle').':
    -
    '.get_string('author', 'repository').':
    -
    '.get_string('dimensions', 'repository').':
    -
    +
    +
    +

    +
    +
    '.get_string('lastmodified', 'moodle').':
    +
    '.get_string('datecreated', 'repository').':
    +
    '.get_string('size', 'repository').':
    +
    '.get_string('license', 'moodle').':
    +
    '.get_string('author', 'repository').':
    +
    '.get_string('dimensions', 'repository').':
    +
    +
    '; return preg_replace('/\{\!\}/', '', $rv); } @@ -791,7 +793,7 @@ class core_files_renderer extends plugin_renderer_base { $rv = '

    - '.get_string('ok').' +
    '; return preg_replace('/\{\!\}/', '', $rv); } @@ -814,9 +816,11 @@ class core_files_renderer extends plugin_renderer_base { $rv = '

    - '.get_string('overwrite', 'repository').' - '.get_string('cancel').' - +
    + + + +
    '; return preg_replace('/\{\!\}/', '', $rv); } diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 7e349d0eabb..c2a25bdbfcb 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -934,8 +934,8 @@ sup {vertical-align: super;} bottom: 0px; left: 18.5em; margin: 0; - padding: 2em 2em 2em 2.4em; - background-color: white; + padding: 1.6em; + background-color: #FFFFFF; overflow-x: hidden; overflow-y: auto; max-height: 550px; @@ -954,4 +954,3 @@ sup {vertical-align: super;} -webkit-box-shadow: 0px 0px 10px 0px #CCCCCC; -moz-box-shadow: 0px 0px 10px 0px #CCCCCC; } - diff --git a/theme/base/style/filemanager.css b/theme/base/style/filemanager.css index b6ed9196b07..8e04ead5651 100644 --- a/theme/base/style/filemanager.css +++ b/theme/base/style/filemanager.css @@ -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;} @@ -43,7 +43,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;} .fp-toolbar.empty {display:none;} .fp-toolbar .disabled {display:none;} .fp-toolbar div {display: inline-block;padding: 0px 2px;padding-right: 10px;} @@ -51,7 +51,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;} .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]]');} @@ -63,7 +63,7 @@ background: #CCCCCC;filter: progid:DXImageTransform.Microsoft.gradient(startColo .fp-viewbar.disabled .fp-vb-tree {background:url('[[pix:theme|fp/view_tree_inactive]]');} .file-picker .fp-clear-left {clear: left;} -.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;} .fp-pathbar .fp-path-folder-name {margin-left: 32px;line-height: 20px;} @@ -154,7 +154,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) @@ -182,18 +183,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;} @@ -313,7 +313,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;} /* * Confirm dialogue for delete (File Manager only) diff --git a/theme/base/style/question.css b/theme/base/style/question.css index d974e50196f..33cedb4dcee 100644 --- a/theme/base/style/question.css +++ b/theme/base/style/question.css @@ -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;} diff --git a/theme/standard/style/question.css b/theme/standard/style/question.css index 2010021e07a..0a2daad679d 100644 --- a/theme/standard/style/question.css +++ b/theme/standard/style/question.css @@ -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;}