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

Merge

Browse Source
skala
Julio Montoya 16 years ago
parent b9486f8f96 c1e2b3a260
commit 674fa9b39b
6 changed files with 27 additions and 35 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. 4
      main/css/blue_lagoon/default.css
  2. 17
      main/css/chamilo/default.css
  3. 2
      main/exercice/exercise_result.php
  4. 2
      main/exercice/exercise_show.php
  5. 6
      main/exercice/multiple_answer_combination.class.php
  6. 31
      main/exercice/question_admin.inc.php

4
main/css/blue_lagoon/default.css
Unescape View File

@ -1240,8 +1240,8 @@ div.report_section h4 {
line-height: 20px; line-height: 20px;
} }
.session_box { .session_box {
background-color: #efefef; background-color: #F6F6F6;
border: 1px solid #666; border: 1px solid #ddd;
font-weight: bold; font-weight: bold;
color: #666; color: #666;
list-style-type: none; list-style-type: none;

17
main/css/chamilo/default.css
Unescape View File

@ -1480,7 +1480,7 @@ div.admin_section h4 {
line-height: 20px; line-height: 20px;
} }
.session_box { .session_box {
background-color: #F0F6FF; background-color: #E5F2F7;
border: 1px solid #DCE5F3; border: 1px solid #DCE5F3;
/* font-weight: bold; */ /* font-weight: bold; */
color: #666; color: #666;
@ -1500,8 +1500,8 @@ div.admin_section h4 {
* DOKEOS CONFIG SETTINGS OF THE PLATFORM ADMIN SECTION * * DOKEOS CONFIG SETTINGS OF THE PLATFORM ADMIN SECTION *
***************************************************************/ ***************************************************************/
.sectiontitle { .sectiontitle {
background-color: #a0e5fc; background-color: #D2ECF5;
border: 1px solid #cccccc; border: 1px solid #ABDAEA;
font-weight: bold; font-weight: bold;
color: #666666; color: #666666;
list-style-type: none; list-style-type: none;
@ -2313,6 +2313,13 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;}
float:left; float:left;
width:100%; width:100%;
} }
.content_table {
padding:2px;
margin-bottom: 5px;
vertical-align:middle;
float:left;
width:100%;
}
.actionsbig a { .actionsbig a {
float:left; float:left;
padding-left:6px; padding-left:6px;
@ -2341,8 +2348,8 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;}
.actions-message { .actions-message {
white-space: nowrap; white-space: nowrap;
padding: 2px; padding: 2px;
background-color: #E5EDF9; background-color: #D2ECF5;
border: 1px solid #bbb; border: 1px solid #ABDAEA;
} }
/********************************************** /**********************************************

2
main/exercice/exercise_result.php
Unescape View File

@ -1196,6 +1196,8 @@ if (api_get_course_setting('email_alert_manager_on_new_quiz') == 1 ) {
$result = api_mail_html('', $to, $subject, $mail_content, $sender_name, $email_admin, array('charset'=>$mycharset)); $result = api_mail_html('', $to, $subject, $mail_content, $sender_name, $email_admin, array('charset'=>$mycharset));
} else { } else {
$msg .= '<body> $msg .= '<body>
<p>'.get_lang('ExerciseAttempted').' <br />
</p>
<table width="730" height="136" border="0" cellpadding="3" cellspacing="3"> <table width="730" height="136" border="0" cellpadding="3" cellspacing="3">
<tr> <tr>
<td width="229" valign="top"><h2>&nbsp;&nbsp;'.get_lang('CourseName').'</h2></td> <td width="229" valign="top"><h2>&nbsp;&nbsp;'.get_lang('CourseName').'</h2></td>

2
main/exercice/exercise_show.php
Unescape View File

@ -1351,6 +1351,8 @@ function send_notification($arrques, $arrans, $to) {
} else { } else {
$msg .= '<body> $msg .= '<body>
<p>'.get_lang('ExerciseAttempted').' <br />
</p>
<table width="730" height="136" border="0" cellpadding="3" cellspacing="3"> <table width="730" height="136" border="0" cellpadding="3" cellspacing="3">
<tr> <tr>
<td width="229" valign="top"><h2>&nbsp;&nbsp;'.get_lang('CourseName').'</h2></td> <td width="229" valign="top"><h2>&nbsp;&nbsp;'.get_lang('CourseName').'</h2></td>

6
main/exercice/multiple_answer_combination.class.php
Unescape View File

@ -133,9 +133,13 @@ class MultipleAnswerCombination extends Question {
$form -> add_multiple_required_rule ($boxes_names , get_lang('ChooseAtLeastOneCheckbox') , 'multiple_required'); $form -> add_multiple_required_rule ($boxes_names , get_lang('ChooseAtLeastOneCheckbox') , 'multiple_required');
//@todo fix my layout please
$html_total_score ='<div style="margin-bottom:2px;">'.get_lang('Score').'</div>';
$form -> addElement ('html', $html_total_score);
//only 1 answer the all deal ... //only 1 answer the all deal ...
$form->addElement('text', 'weighting[1]',null, 'style="vertical-align:middle;margin-left: 0em;" size="5" value="10"'); $form->addElement('text', 'weighting[1]',null, 'style="vertical-align:middle;margin-left: 0em;" size="5" value="10"');
$form -> addElement ('html', '<br /><br />');
$navigator_info = api_get_navigator(); $navigator_info = api_get_navigator();
global $text, $class; global $text, $class;

31
main/exercice/question_admin.inc.php
Unescape View File

@ -1,25 +1,5 @@
<?php <?php
/* /* For licensing terms, see /chamilo_license.txt */
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2009 Dokeos SPRL
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
/** /**
* Statement (?) administration * Statement (?) administration
@ -40,8 +20,7 @@ include_once(api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php')
include_once(api_get_path(LIBRARY_PATH).'image.lib.php'); include_once(api_get_path(LIBRARY_PATH).'image.lib.php');
// ALLOWED_TO_INCLUDE is defined in admin.php // ALLOWED_TO_INCLUDE is defined in admin.php
if(!defined('ALLOWED_TO_INCLUDE')) if(!defined('ALLOWED_TO_INCLUDE')) {
{
exit(); exit();
} }
@ -49,8 +28,7 @@ if(!defined('ALLOWED_TO_INCLUDE'))
/********************* /*********************
* INIT QUESTION * INIT QUESTION
*********************/ *********************/
if(isset($_GET['editQuestion'])) if(isset($_GET['editQuestion'])) {
{
$objQuestion = Question::read ($_GET['editQuestion']); $objQuestion = Question::read ($_GET['editQuestion']);
$action = api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&editQuestion=".$objQuestion->id; $action = api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&editQuestion=".$objQuestion->id;
@ -70,8 +48,7 @@ if(isset($_GET['editQuestion']))
$action = api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion; $action = api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion;
} }
if(is_object($objQuestion)) if(is_object($objQuestion)) {
{
/********************* /*********************
* FORM STYLES * FORM STYLES

Write Preview
Loading…
Cancel
Save