chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing queries, fixing forms

Browse Source
skala
Julio Montoya 14 years ago
parent 48b1bf0723
commit be6e40095b
11 changed files with 71 additions and 48 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      main/admin/group_list.php
  2. 4
      main/auth/profile.php
  3. 3
      main/coursecopy/classes/Link.class.php
  4. 4
      main/coursecopy/copy_course_session.php
  5. 2
      main/inc/lib/message.lib.php
  6. 13
      main/messages/new_message.php
  7. 5
      main/newscorm/learnpath.class.php
  8. 18
      main/newscorm/lp_edit.php
  9. 38
      main/social/home.php
  10. 10
      main/template/default/skill/skill_tree.tpl
  11. 19
      main/template/default/skill/skill_tree_student.tpl

3
main/admin/group_list.php
Unescape View File

@ -10,7 +10,6 @@
$language_file = array ('registration','admin','userInfo');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php';
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
@ -376,7 +375,7 @@ else
//$form->addElement('static','search_advanced_link',null,'<a href="user_list.php?search=advanced">'.get_lang('AdvancedSearch').'</a>');
echo '<div class="actions" style="width:100%;">';
if (api_is_platform_admin()) {
echo '<span style="float:right; padding-top:7px;">'.
echo '<span style="float:right;">'.
'<a href="'.api_get_path(WEB_CODE_PATH).'admin/group_add.php">'.Display::return_icon('create_group_social_network.png',get_lang('AddGroups'),'','32').'</a>'.
'</span>';
}

4
main/auth/profile.php
Unescape View File

@ -272,9 +272,7 @@ if (api_get_setting('extended_profile') == 'true') {
// PASSWORD
if (is_profile_editable() && api_get_setting('profile', 'password') == 'true') {
$form->addElement('password', 'password0', get_lang('Pass'), array('size' => 40));
$form->addElement('static', null, null, '<em>'.get_lang('Enter2passToChange').'</em>');
$form->addElement('password', 'password0', array(get_lang('Pass'), get_lang('Enter2passToChange')), array('size' => 40));
$form->addElement('password', 'password1', get_lang('NewPass'), array('size' => 40));
$form->addElement('password', 'password2', get_lang('Confirmation'), array('size' => 40));
// user must enter identical password twice so we can prevent some user errors

3
main/coursecopy/classes/Link.class.php
Unescape View File

@ -60,5 +60,4 @@ class Link extends Resource
parent::show();
echo $this->title.' ('.$this->url.')';
}
}
?>
}

4
main/coursecopy/copy_course_session.php
Unescape View File

@ -311,7 +311,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
$cr = new CourseRestorer($course);
//$cr->set_file_option($_POST['same_file_name_option']);
$cr->restore($destination_course, $destination_session);
Display::display_normal_message(get_lang('CopyFinished'));
Display::display_confirmation_message(get_lang('CopyFinished'));
display_form();
} else {
@ -352,7 +352,7 @@ if ((isset($_POST['action']) && $_POST['action'] == 'course_select_form') || (is
$cr->restore($course_destinatination, $destination_session);
//}
}
Display::display_normal_message(get_lang('CopyFinished'));
Display::display_confirmation_message(get_lang('CopyFinished'));
display_form();
} else {
Display::display_error_message(get_lang('YouMustSelectACourseFromOriginalSession'));

2
main/inc/lib/message.lib.php
Unescape View File

@ -1269,7 +1269,7 @@ function inbox_display() {
$action=api_xml_http_response_encode(get_lang('Modify'));
$table->set_header(1,api_xml_http_response_encode(get_lang('Messages')),false);
//$table->set_header(2,$title,true);
$table->set_header(2,api_xml_http_response_encode(get_lang('Date')),true, array('style' => 'width:160px;'));
$table->set_header(2,api_xml_http_response_encode(get_lang('Date')),true, array('style' => 'width:180px;'));
$table->set_header(3,$action,false,array ('style' => 'width:70px;'));
if ($_REQUEST['f']=='social') {

13
main/messages/new_message.php
Unescape View File

@ -141,18 +141,16 @@ function show_compose_reply_to_message($message_id, $receiver_id) {
$row = Database::fetch_array($result,'ASSOC');
if (!isset($row['user_sender_id'])) {
echo get_lang('InvalidMessageId');
die();
exit;
}
$pre_html = '<div class="row">
<div class="label">'.get_lang('SendMessageTo').'</div>
<div class="label">'.get_lang('SendMessageTo').': </div>
<div class="formw">';
$post = '</div></div>';
$multi_select = '<select id="users" name="users">
</select>';
echo $pre_html.'<strong>'.GetFullUserName($row['user_sender_id']).'</strong>'.$post;
//echo get_lang('To').':&nbsp;<strong>'. GetFullUserName($row['user_sender_id']).'</strong>';
//$default['title'] = get_lang('EnterTitle');
echo $pre_html.'<strong>'.GetFullUserName($row['user_sender_id']).'</strong>'.$post;
$default['users'] = array($row['user_sender_id']);
manage_form($default);
}
@ -183,8 +181,9 @@ function manage_form ($default, $select_from_user_list = null) {
if (empty($default['users'])) {
//the magic should be here
$pre_html = '<div class="row">
<div class="label">'.get_lang('SendMessageTo').'</div>
<div class="label">'.get_lang('SendMessageTo').'</div>
<div class="formw">';
$post = '</div></div>';
$multi_select = '<select id="users" name="users">
</select>';

5
main/newscorm/learnpath.class.php
Unescape View File

@ -3620,6 +3620,7 @@ class learnpath {
*/
public function toggle_publish($lp_id, $set_visibility = 'v') {
//if ($this->debug > 0) { error_log('New LP - In learnpath::toggle_publish()', 0); }
$course_id = api_get_course_int_id();
$tbl_lp = Database :: get_course_table(TABLE_LP_MAIN);
$sql = "SELECT * FROM $tbl_lp where c_id = ".$course_id." AND id=$lp_id";
$result = Database::query($sql);
@ -4457,6 +4458,8 @@ class learnpath {
*/
public function update_display_order() {
$lp_table = Database :: get_course_table(TABLE_LP_MAIN);
$course_id = api_get_course_int_id();
$sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." ORDER BY display_order";
$res = Database::query($sql);
if ($res === false)
@ -7706,7 +7709,7 @@ class learnpath {
$preq_id = $row['prerequisite'];
$session_id = api_get_session_id();
$session_condition = api_get_session_condition($session_id);
echo $sql = "SELECT * FROM $tbl_lp WHERE c_id = $course_id $session_condition ORDER BY display_order ";
$sql = "SELECT * FROM $tbl_lp WHERE c_id = $course_id $session_condition ORDER BY display_order ";
$rs = Database::query($sql);
$return = '';
$return .= '<select name="prerequisites" >';

18
main/newscorm/lp_edit.php
Unescape View File

@ -6,7 +6,6 @@
* @author Yannick Warnier <ywarnier@beeznest.org>
*/
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
global $charset;
@ -126,7 +125,7 @@ $content_proximity_select->addOption(get_lang('Local'), 'local');
$content_proximity_select->addOption(get_lang('Remote'), 'remote');
*/
//Hide toc frame
$hide_toc_frame = &$form->addElement('checkbox', 'hide_toc_frame', get_lang('HideTocFrame'),'', array('onclick' => '$("#lp_layout_column").toggle()' ));
$hide_toc_frame = &$form->addElement('checkbox', 'hide_toc_frame', null, get_lang('HideTocFrame'),array('onclick' => '$("#lp_layout_column").toggle()' ));
if (api_get_setting('allow_course_theme') == 'true') {
$mycourselptheme = api_get_course_setting('allow_learning_path_theme');
if (!empty($mycourselptheme) && $mycourselptheme!=-1 && $mycourselptheme== 1) {
@ -156,9 +155,9 @@ if (strlen($_SESSION['oLP']->get_preview_image()) > 0) {
$form->addElement('html', $div .'<br />');
$form->addElement('checkbox', 'remove_picture', null, get_lang('DelImage'));
}
$label = ($_SESSION['oLP']->get_preview_image() != '' ? get_lang('UpdateImage') : get_lang('AddImage'));
$form->addElement('file', 'lp_preview_image', array($label, get_lang('ImageWillResizeMsg')));
$form->addElement('file', 'lp_preview_image', ($_SESSION['oLP']->get_preview_image() != '' ? get_lang('UpdateImage') : get_lang('AddImage')));
$form->addElement('static', null, null, get_lang('ImageWillResizeMsg'));
$form->addRule('lp_preview_image', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
// Search terms (only if search is activated).
@ -194,12 +193,13 @@ $expired_on = $_SESSION['oLP'] ->expired_on;
$publicated_on = $_SESSION['oLP'] ->publicated_on;
// Prerequisites
$form->addElement('html', '<div class="row"><div class="label">'.get_lang('Prerequisites').'</div><div class="formw">'.$_SESSION['oLP']->display_lp_prerequisites_list().'</div></div>');
$form->addElement('static', null, null, get_lang('LpPrerequisiteDescription'));
$form->addElement('html', '<div class="row"><div class="label">'.get_lang('Prerequisites').'</div>
<div class="formw">'.$_SESSION['oLP']->display_lp_prerequisites_list().' <span class="help-block">'.get_lang('LpPrerequisiteDescription').'</span></div></div>');
//Start date
$form->addElement('checkbox', 'activate_start_date_check', get_lang('EnableStartTime'),null, array('onclick' => 'activate_start_date()'));
$form->addElement('checkbox', 'activate_start_date_check', null,get_lang('EnableStartTime'), array('onclick' => 'activate_start_date()'));
$display_date = 'none';
if ($publicated_on!='0000-00-00 00:00:00' && !empty($publicated_on)) {
$display_date = 'block';
@ -211,7 +211,7 @@ $form->addElement('datepicker', 'publicated_on', get_lang('PublicationDate'), ar
$form->addElement('html','</div>');
//End date
$form->addElement('checkbox', 'activate_end_date_check', get_lang('EnableEndTime'), null,array('onclick' => 'activate_end_date()'));
$form->addElement('checkbox', 'activate_end_date_check', null, get_lang('EnableEndTime'), array('onclick' => 'activate_end_date()'));
$display_date = 'none';
if ($expired_on!='0000-00-00 00:00:00' && !empty($expired_on)) {
$display_date = 'block';
@ -223,7 +223,7 @@ $form->addElement('datepicker', 'expired_on', get_lang('ExpirationDate'), array(
$form->addElement('html','</div>');
if (api_is_platform_admin()) {
$form->addElement('checkbox', 'use_max_score', get_lang('UseMaxScore100'));
$form->addElement('checkbox', 'use_max_score', null, get_lang('UseMaxScore100'));
$defaults['use_max_score'] = $_SESSION['oLP']->use_max_score;
}

38
main/social/home.php
Unescape View File

@ -97,24 +97,28 @@ echo '<div id="social-content">';
<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php">
'.Display::return_icon('profile_edit.png', get_lang('EditProfile'), array('hspace'=>'6')).get_lang('EditProfile').'
</a>
</div>';
echo '</div>';
</div>';
$skill = new Skill();
$skills = $skill->get_user_skills(api_get_user_id(), true);
echo '<div class="left" style="width:280px">';
echo '<div class="social-groups-home-title">'.get_lang('Skills').'</div>';
$lis = '';
if (!empty($skills)) {
foreach($skills as $skill) {
$lis .= Display::tag('li', Display::span($skill['name'], array('class'=>'label_tag skill')));
}
echo Display::tag('ul', $lis);
}
$url = api_get_path(WEB_CODE_PATH).'social/skills_tree.php';
echo Display::url(get_lang('ViewSkillsTree'), $url);
echo '</div>';
echo '</div>'; // end social_user_information
$skill = new Skill();
$skills = $skill->get_user_skills(api_get_user_id(), true);
echo '<div class="left" style="width:280px">';
echo '<div class="social-groups-home-title">'.get_lang('Skills').'</div>';
$lis = '';
if (!empty($skills)) {
foreach($skills as $skill) {
$lis .= Display::tag('li', Display::span($skill['name'], array('class'=>'label_tag skill')));
}
echo Display::tag('ul', $lis);
}
$url = api_get_path(WEB_CODE_PATH).'social/skills_tree.php';
echo Display::url(get_lang('ViewSkillsTree'), $url);
echo '</div>';
@ -179,6 +183,8 @@ echo '<div id="social-content">';
}
echo '</div>';
echo '</div>';
echo '</div>';

10
main/template/default/skill/skill_tree.tpl
Unescape View File

@ -2,19 +2,19 @@
/* just because */
body {
/* fallback */
background-color: #2F2727;
background-color: #eee;
background-image: url(images/radial_bg.png);
background-position: center center;
background-repeat: no-repeat;
/* Safari 4-5, Chrome 1-9 */ /* Can't specify a percentage size? Laaaaaame. */
background: -webkit-gradient(radial, center center, 0, center center, 460, from(#1a82f7), to(#2F2727));
background: -webkit-gradient(radial, center center, 0, center center, 460, from(#eee), to(#666));
/* Safari 5.1+, Chrome 10+ */
background: -webkit-radial-gradient(circle, #1a82f7, #2F2727);
background: -webkit-radial-gradient(circle, #eee, #666);
/* Firefox 3.6+ */
background: -moz-radial-gradient(circle, #1a82f7, #2F2727);
background: -moz-radial-gradient(circle, #eee, #666);
/* IE 10 */
background: -ms-radial-gradient(circle, #1a82f7, #2F2727);
background: -ms-radial-gradient(circle, #eee, #666);
}
</style>
<script type="text/javascript">

19
main/template/default/skill/skill_tree_student.tpl
Unescape View File

@ -1,3 +1,22 @@
<style>
/* just because */
body {
/* fallback */
background-color: #eee;
background-image: url(images/radial_bg.png);
background-position: center center;
background-repeat: no-repeat;
/* Safari 4-5, Chrome 1-9 */ /* Can't specify a percentage size? Laaaaaame. */
background: -webkit-gradient(radial, center center, 0, center center, 460, from(#eee), to(#666));
/* Safari 5.1+, Chrome 10+ */
background: -webkit-radial-gradient(circle, #eee, #666);
/* Firefox 3.6+ */
background: -moz-radial-gradient(circle, #eee, #666);
/* IE 10 */
background: -ms-radial-gradient(circle, #eee, #666);
}
</style>
<script type="text/javascript">
//js settings

Write Preview
Loading…
Cancel
Save