[svn r14053] add an option to take slide name as step name in oogie

main/newscorm/lp_upload.php

@@ -83,8 +83,9 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST'
 			break;
 		case 'oogie':
 			require_once('openoffice_presentation.class.php');
-			$o_ppt = new OpenofficePresentation();
-			$first_item_id = $o_ppt -> convert_document($_FILES['user_file']);				
+			$take_slide_name = empty($_POST['take_slide_name']) ? false : true;
+			$o_ppt = new OpenofficePresentation($take_slide_name);
+			$first_item_id = $o_ppt -> convert_document($_FILES['user_file']);		
 			break;
 		case 'woogie':
 			require_once('openoffice_text_document.class.php');

main/newscorm/openoffice_document.class.php

@@ -22,7 +22,7 @@ abstract class OpenofficeDocument extends learnpath {
 	 * @param	integer	User ID
 	 */
     function OpenofficeDocument($course_code=null,$resource_id=null,$user_id=null) {
-    	if($this->debug>0){error_log('In OogieWoogie::OogieWoogie()',0);}
+    	if($this->debug>0){error_log('In OpenofficeDocument::OpenofficeDocument()',0);}
     	if(!empty($course_code) and !empty($resource_id) and !empty($user_id))
     	{
     		parent::learnpath($course_code, $resource_id, $user_id);

main/newscorm/openoffice_presentation.class.php

@@ -12,6 +12,15 @@
 require_once('openoffice_document.class.php');
 
 class OpenofficePresentation extends OpenofficeDocument {
+	
+	public $take_slide_name;
+	
+	function OpenofficePresentation($take_slide_name=false, $course_code=null, $resource_id=null,$user_id=null) {
+		
+		$this -> take_slide_name = $take_slide_name;
+		parent::OpenofficeDocument($course_code, $resource_id, $user_id);
+		
+	}
 
     
     function make_lp($files = array()) {
@@ -47,7 +56,14 @@ class OpenofficePresentation extends OpenofficeDocument {
 				api_item_property_update($_course,TOOL_DOCUMENT,$document_id,'DocumentAdded',$_SESSION['_uid'],0,0);
 				
 				$infos = pathinfo($file);
-				$slide_name = 'slide'.str_repeat('0',2-strlen($i)).$i;
+				if($this->take_slide_name === true)
+				{
+					$slide_name = substr($infos['basename'],0,strrpos($infos['basename'],'.'));
+				}
+				else
+				{
+					$slide_name = 'slide'.str_repeat('0',2-strlen($i)).$i;
+				}
 				$previous = learnpath::add_item(0, $previous, 'document', $document_id, $slide_name, '');
 				if($this->first_item == 0){
 					$this->first_item = $previous;

main/upload/upload_ppt.php

@@ -27,6 +27,10 @@ $form_style= '
 .row {
 	width: 200px;
 }
+.convert_button{
+	background: url("../img/scorm.gif") 0px 0px no-repeat;
+	padding: 2px 0px 2px 22px;
+}
 </style>';
 
 $htmlHeadXtra[] = '<script language="javascript" src="../inc/lib/javascript/upload.js" type="text/javascript"></script>';
@@ -106,37 +110,23 @@ if(!empty($errorMessage)){
 	//Display::display_error_message($errorMessage);
 	echo '<div style="'.$s_style_error.'"><div style="float:left; margin-right:10px;"><img src="'.api_get_path(WEB_IMG_PATH)."message_error.gif".'" alt="'.$alt_text.'" '.$attribute_list.'  /></div><div style="margin-left: 43px">'.$errorMessage.'</div></div>';
 }
-echo '
-<style>
-.row{
-	width:90%;
-}
-div.row div.label {
-	width: 0%;
-}
 
-div.row div.formw {
-	width: 100%;
-}
-.convert_button{
-	background: url("../img/scorm.gif") 0px 0px no-repeat;
-	padding: 2px 0px 2px 22px;
-}
 
-</style>';
 $form = new FormValidator('update_course', 'POST', '', '', 'style="margin: 0;"');
 
 // build the form
 
 $form -> addElement ('html','<br>');
 
-$group = array();
-$group[] = FormValidator::createElement ('image','ppt_img','../img/powerpoint_big.gif','align="absbottom"');
-$group[] = FormValidator::createElement ('file', 'user_file',null);
-$group[] = FormValidator::createElement ('submit', 'convert', get_lang('ConvertToLP'), 'class="convert_button"');
-$form -> addGroup($group);
+$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" />');
+$form -> addElement ('checkbox', 'take_slide_name','', get_lang('TakeSlideName'));
+$form -> addElement ('submit', 'convert', get_lang('ConvertToLP'), 'class="convert_button"');
 
-$form -> addElement('html','<br /><div style="margin:7px;">'.get_lang('UploadMaxSize').' : '.ini_get('post_max_size').'</div>');
+$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');