From 0b7df6b479b9b3934e8e01dae7f8f47e44f8f4e9 Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Mon, 13 Apr 2015 14:29:43 +0200 Subject: [PATCH] Dev: add some class for upload question type --- application/controllers/UploaderController.php | 2 +- scripts/modaldialog.js | 2 ++ styles-public/uploader.css | 17 +++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/application/controllers/UploaderController.php b/application/controllers/UploaderController.php index ec35d0d63ce..db5117ba309 100644 --- a/application/controllers/UploaderController.php +++ b/application/controllers/UploaderController.php @@ -339,7 +339,7 @@ function run($actionID) $maxfiles = (int)Yii::app()->request->getParam('maxfiles'); $qidattributes=getQuestionAttributeValues($qid); $qidattributes['max_filesize']=floor(min($qidattributes['max_filesize']*1024,getMaximumFileUploadSize())/1024); - $body = ' + $body = '
diff --git a/scripts/modaldialog.js b/scripts/modaldialog.js index ee1742677f5..f0558a3630c 100644 --- a/scripts/modaldialog.js +++ b/scripts/modaldialog.js @@ -30,6 +30,7 @@ function openUploadModalDialog(){ autoResize: false, draggable: true, closeOnEscape: false, + dialogClass: "dialog-upload", beforeClose: function() { var pass; if(document.getElementById('uploader').contentDocument) { @@ -63,6 +64,7 @@ $(window).resize(function() { /* Reset the position of the dialog (recenter) */ function resetUploaderPosition(){ $( "#uploader" ).dialog( "option", "position", $( "#uploader" ).dialog( "option", "position" ) ); + } /* Set the with of upload madal and uploader frame according to windows width */ function setWidthUploader(){ diff --git a/styles-public/uploader.css b/styles-public/uploader.css index 9541a919bc2..f70b94dacba 100644 --- a/styles-public/uploader.css +++ b/styles-public/uploader.css @@ -1,13 +1,14 @@ -body {font-family: verdana, arial, helvetica, sans-serif;font-size: 12px;color: black; direction: ltr;} -h1 {color: #C7D92C; font-size: 18px; font-weight: 400;} -a {color: white;} -a:hover, a.hover {color: #C7D92C;} -ul { list-style: none; } -#dialog-confirm { padding: 0 20px; float: left; width: 750px; } +#dialog-confirm { padding: 0 20px; float: left; width: 750px; }/* Used .*/ /* Using display:table and hack for IE6/7 */ -.files-list{display:table;table-layout:fixed;width:100%;list-style:none} +.files-list{display:table;table-layout:fixed;width:100%;list-style:none;padding:0;margin:0;} .file-element{display:table-row;width:100%;padding:0.5em 0;} +.file-info fieldset{ +border:0 none; +padding:0; +margin:0; +} + .file-preview,.file-info,.file-tool{ display:table-cell;vertical-align:middle; * float:left @@ -39,7 +40,7 @@ text-align:left; clear:left; display:block; width:12em; - padding:0 1em; + padding:0 0.5em; line-height:1.5; text-align:right; }