[svn r15269] improve display of oogie / woogie converter (FS#2480)

skala
Eric Marguin 18 years ago
parent 5c23c46cfb
commit 67526d0a4b
  1. BIN
      main/img/powerpoint_big.gif
  2. 6
      main/inc/lib/formvalidator/FormValidator.class.php
  3. 34
      main/upload/upload_ppt.php
  4. 31
      main/upload/upload_word.php

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -266,9 +266,11 @@ EOT;
// IMPORTANT : must be the first element of the form
$el = $this->insertElementBefore(FormValidator::createElement('html','<input type="hidden" name="UPLOAD_IDENTIFIER" value="'.$upload_id.'" />'), $elementAfter);
$this->addElement('html','<br />');
// add the div where the progress bar will be displayed
$this->addElement('html','
<div id="dynamic_div_container" style="display:none;"><br />
<div id="dynamic_div_container" style="display:none">
<div id="dynamic_div_label">'.get_lang('UploadFile').'</div>
<div id="dynamic_div_frame" style="width:214px; height:12px; border:1px solid grey; background-image:url('.api_get_path(REL_PATH).'main/img/real_upload_frame.gif);">
<div id="dynamic_div_filled" style="width:0%;height:100%;background-image:url('.api_get_path(REL_PATH).'main/img/real_upload_step.gif);background-repeat:repeat-x;background-position:center;"></div>
@ -277,7 +279,7 @@ EOT;
if($waitAfterUpload){
$this->addElement('html','
<div id="dynamic_div_waiter_container" style="display:none;">
<div id="dynamic_div_waiter_container" style="display:none">
<div id="dynamic_div_waiter_label">
'.get_lang('SlideshowConversion').'
</div>

@ -31,6 +31,8 @@ $form_style= '
background: url("../img/scorm.gif") 0px 0px no-repeat;
padding: 2px 0px 2px 22px;
}
#dynamic_div_container{float:left;margin-right:10px;}
#dynamic_div_waiter_container{float:left;}
</style>';
$htmlHeadXtra[] = '<script language="javascript" src="../inc/lib/javascript/upload.js" type="text/javascript"></script>';
@ -126,22 +128,42 @@ if(!empty($errorMessage)){
}
$form = new FormValidator('upload_ppt', 'POST', '', '', 'style="margin: 0;"');
$form = new FormValidator('upload_ppt', 'POST', '', '');
// build the form
$form -> addElement ('html','<br>');
$div_upload_limit = '&nbsp;&nbsp;'.get_lang('UploadMaxSize').' : '.ini_get('post_max_size');
$renderer = & $form->defaultRenderer();
$user_file_template = str_replace('<div class="formw">', '<div class="formw" style="padding-top:7px;">', $renderer->_elementTemplate);
$renderer->setElementTemplate($user_file_template, 'user_file');
$form -> addElement ('file', 'user_file','<img src="../img/powerpoint_big.gif" align="absbottom" />');
// set template for user_file element
$user_file_template =
<<<EOT
<div class="row" style="margin-top:10px;width:100%">
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}{element}$div_upload_limit
<!-- BEGIN error --><br /><span class="form_error">{error}</span><!-- END error -->
</div>
EOT;
$renderer->setElementTemplate($user_file_template,'user_file');
// set template for other elements
$user_file_template =
<<<EOT
<div class="row" style="margin-top:10px;width:100%">
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}{element}
<!-- BEGIN error --><br /><span class="form_error">{error}</span><!-- END error -->
</div>
EOT;
$renderer->setElementTemplate($user_file_template);
$form -> addElement ('file', 'user_file','<img src="../img/powerpoint_big.gif" align="absbottom" />&nbsp;&nbsp;');
$form -> addElement ('checkbox', 'take_slide_name','', get_lang('TakeSlideName'));
$form -> addElement ('submit', 'convert', get_lang('ConvertToLP'), 'class="convert_button"');
$form -> addElement('html','<div class="row"><div class="label"></div><div class="formw">'.get_lang('UploadMaxSize').' : '.ini_get('post_max_size').'</div></div>');
$form -> addElement ('hidden', 'ppt2lp', 'true');
$form -> add_real_progress_bar(md5(rand(0,10000)), 'user_file', 1, true);

@ -27,6 +27,12 @@ $form_style= '
.row {
width: 200px;
}
.convert_button{
background: url("../img/scorm.gif") 0px 0px no-repeat;
padding: 2px 0px 2px 22px;
}
#dynamic_div_container{float:left;margin-right:10px;}
#dynamic_div_waiter_container{float:left;}
</style>';
$htmlHeadXtra[] = '<script language="javascript" src="../inc/lib/javascript/upload.js" type="text/javascript"></script>';
@ -125,9 +131,28 @@ $form = new FormValidator('update_course', 'POST', '', '', 'style="margin: 0;"')
$form -> addElement ('html','<br>');
$div_upload_limit = '&nbsp;&nbsp;'.get_lang('UploadMaxSize').' : '.ini_get('post_max_size');
$renderer = & $form->defaultRenderer();
$user_file_template = str_replace('<div class="formw">', '<div class="formw" style="padding-top:7px;">', $renderer->_elementTemplate);
$renderer->setElementTemplate($user_file_template, 'user_file');
// set template for user_file element
$user_file_template =
<<<EOT
<div class="row" style="margin-top:10px;width:100%">
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}{element}$div_upload_limit
<!-- BEGIN error --><br /><span class="form_error">{error}</span><!-- END error -->
</div>
EOT;
$renderer->setElementTemplate($user_file_template,'user_file');
// set template for other elements
$user_file_template =
<<<EOT
<div class="row" style="margin-top:10px;width:100%">
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}{element}
<!-- BEGIN error --><br /><span class="form_error">{error}</span><!-- END error -->
</div>
EOT;
$renderer->setElementTemplate($user_file_template);
$form -> addElement ('file', 'user_file','<img src="../img/word_big.gif" align="absbottom" />');
@ -140,8 +165,6 @@ $form -> addElement ('hidden', 'split_steps','per_page');
$form -> addElement ('submit', 'convert', get_lang('ConvertToLP'), 'class="convert_button"');
$form -> addElement('html','<div class="row"><div class="label"></div><div class="formw">'.get_lang('UploadMaxSize').' : '.ini_get('post_max_size').'</div></div>');
$form -> addElement ('hidden', 'woogie', 'true');
$form -> add_real_progress_bar(md5(rand(0,10000)), 'user_file', 1, true);

Loading…
Cancel
Save