From 9a721965d31b61f633dcecaebca7e014140fecab Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 14 Mar 2012 13:52:04 +0100 Subject: [PATCH] Adding comments + minor style changes --- .../pear/HTML/QuickForm/advanced_settings.php | 23 +---------------- main/inc/lib/pear/HTML/QuickForm/label.php | 1 + main/newscorm/lp_edit.php | 25 ++++--------------- main/template/default/agenda/month.tpl | 3 +-- 4 files changed, 8 insertions(+), 44 deletions(-) diff --git a/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php b/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php index 31c89a687b..70c6bf3df0 100644 --- a/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php +++ b/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php @@ -1,28 +1,7 @@ - * @copyright 2001-2009 The PHP Group - * @license http://www.php.net/license/3_01.txt PHP License 3.01 - * @version CVS: $Id: html.php,v 1.3 2009/04/04 21:34:03 avb Exp $ - * @link http://pear.php.net/package/HTML_QuickForm - */ - /** * HTML class for static data + * @example $form->addElement('advanced_settings', 'advanced settings'); */ require_once 'HTML/QuickForm/static.php'; diff --git a/main/inc/lib/pear/HTML/QuickForm/label.php b/main/inc/lib/pear/HTML/QuickForm/label.php index 9aebe42bc8..8330ffee39 100644 --- a/main/inc/lib/pear/HTML/QuickForm/label.php +++ b/main/inc/lib/pear/HTML/QuickForm/label.php @@ -1,6 +1,7 @@ addElement('label', 'My label', 'Content'); */ require_once 'HTML/QuickForm/static.php'; diff --git a/main/newscorm/lp_edit.php b/main/newscorm/lp_edit.php index 9e9b6996db..1c9fbf552a 100644 --- a/main/newscorm/lp_edit.php +++ b/main/newscorm/lp_edit.php @@ -147,14 +147,8 @@ $form->applyFilter('lp_author', 'html_filter'); // LP image $form->add_progress_bar(); if (strlen($_SESSION['oLP']->get_preview_image()) > 0) { - $show_preview_image='get_preview_image().'>'; - $div = '
-
'.get_lang('ImagePreview').'
-
- '.$show_preview_image.' -
-
'; - $form->addElement('html', $div .'
'); + $show_preview_image='get_preview_image().'>'; + $form->addElement('label', get_lang('ImagePreview'), $show_preview_image); $form->addElement('checkbox', 'remove_picture', null, get_lang('DelImage')); } $label = ($_SESSION['oLP']->get_preview_image() != '' ? get_lang('UpdateImage') : get_lang('AddImage')); @@ -179,13 +173,6 @@ if (api_get_setting('search_enabled') === 'true') { } } -// Default values -//$content_proximity_select -> setSelected($s_selected_proximity); -//$origin_select -> setSelected($s_selected_origin); - -/* // Chamilo 1.8.8: Deprecated code. -$encoding_select -> setSelected($s_selected_encoding); -*/ $defaults['lp_encoding'] = Security::remove_XSS($_SESSION['oLP']->encoding); $defaults['lp_name'] = Security::remove_XSS($_SESSION['oLP']->get_name()); $defaults['lp_author'] = Security::remove_XSS($_SESSION['oLP']->get_author()); @@ -195,10 +182,8 @@ $expired_on = $_SESSION['oLP'] ->expired_on; $publicated_on = $_SESSION['oLP'] ->publicated_on; // Prerequisites -$form->addElement('html', '
'.get_lang('Prerequisites').'
-
'.$_SESSION['oLP']->display_lp_prerequisites_list().' '.get_lang('LpPrerequisiteDescription').'
'); - - +$form->addElement('html', '
+
'.$_SESSION['oLP']->display_lp_prerequisites_list().' '.get_lang('LpPrerequisiteDescription').'
'); //Start date $form->addElement('checkbox', 'activate_start_date_check', null,get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()')); @@ -252,4 +237,4 @@ else{ } echo ''; -Display::display_footer(); +Display::display_footer(); \ No newline at end of file diff --git a/main/template/default/agenda/month.tpl b/main/template/default/agenda/month.tpl index e9517e860f..999c5d54d0 100644 --- a/main/template/default/agenda/month.tpl +++ b/main/template/default/agenda/month.tpl @@ -452,7 +452,7 @@ $(document).ready(function() {
- +
@@ -470,6 +470,5 @@ $(document).ready(function() { -
\ No newline at end of file