Minor - format changes

skala
Julio Montoya 13 years ago
parent f2cd874cda
commit 7e76838566
  1. 2
      main/exercice/question_admin.inc.php
  2. 16
      main/exercice/question_list_admin.inc.php
  3. 17
      main/inc/global.inc.php
  4. 1
      main/inc/lib/introductionSection.inc.php

@ -96,4 +96,4 @@ if (is_object($objQuestion)) {
// display the form
$form->display();
}
}
}

@ -83,11 +83,10 @@ $(function() {
});
var icons = {
header: "ui-icon-circle-arrow-e",
headerSelected: "ui-icon-circle-arrow-s"
header: "ui-icon-circle-arrow-e",
headerSelected: "ui-icon-circle-arrow-s"
};
/* We can add links in the accordion header */
$("div > div > div > .edition > div > a").click(function() {
//Avoid the redirecto when selecting the delete button
@ -103,7 +102,7 @@ $(function() {
autoHeight: false,
active: false, // all items closed by default
collapsible: true,
header: ".header_operations",
header: ".header_operations"
})
.sortable({
@ -189,18 +188,18 @@ if (!$inATest) {
// Question name
$questionName = Display::tag('div', '<a href="#" title = "'.$title.'">'.$move.' '.Text::cut($title, 42).'</a>', array('style'=>$styleQuestion));
// Question type
// Question type.
list($typeImg, $typeExpl) = $objQuestionTmp->get_type_icon_html();
$question_media = null;
if (!empty($objQuestionTmp->parent_id)) {
$objQuestionMedia = Question::read($objQuestionTmp->parent_id);
$question_media = Display::label($objQuestionMedia->question, 'info');
$question_media = ' '.Display::label($objQuestionMedia->question, 'success');
}
$questionType = Display::tag('div', Display::return_icon($typeImg, $typeExpl, array(), ICON_SIZE_MEDIUM), array('style' => $styleType));
// Question category
// Question category.
$category_labels = Testcategory::return_category_labels($objQuestionTmp->category_list, $category_list);
if (empty($category_labels)) {
@ -208,7 +207,7 @@ if (!$inATest) {
}
$questionCategory = Display::tag('div', '<a href="#" style="padding:0px; margin:0px;">'.$category_labels.$question_media.'</a>', array('style'=>$styleCat));
// Question level
// Question level.
$txtQuestionLevel = $objQuestionTmp->level;
if (empty($objQuestionTmp->level)) {
$txtQuestionLevel = '-';
@ -222,7 +221,6 @@ if (!$inATest) {
echo '<div class="header_operations">';
echo $questionName;
echo $questionType;
echo $questionCategory;
echo $questionLevel;
echo $questionScore;

@ -1,5 +1,5 @@
<?php
/* For licensing terms, see /license.txt */
/** For licensing terms, see /license.txt */
/**
* This is a bootstrap file that loads all Chamilo dependencies including:
@ -19,13 +19,12 @@
*/
// Fix bug in IIS that doesn't fill the $_SERVER['REQUEST_URI'].
//@todo not sure if we need this
//api_request_uri();
// @todo not sure if we need this
// api_request_uri();
// This is for compatibility with MAC computers.
//ini_set('auto_detect_line_endings', '1');
// Composer autoloader
// Composer auto loader.
require_once __DIR__.'../../../vendor/autoload.php';
use Silex\Application;
@ -35,10 +34,10 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Yaml\Parser;
// Determine the directory path for this file
// Determine the directory path for this file.
$includePath = dirname(__FILE__);
// Start Silex
// Start Silex.
$app = new Application();
// @todo add a helper to read the configuration file once!
@ -69,7 +68,7 @@ if (file_exists($configurationFilePath) || file_exists($configurationYMLFile) |
$_configuration = array();
}
//Overwriting $_configuration
// Overwriting $_configuration
if (file_exists($configurationYMLFile)) {
$yaml = new Parser();
$configurationYML = $yaml->parse(file_get_contents($configurationYMLFile));
@ -81,6 +80,7 @@ if (file_exists($configurationYMLFile)) {
}
}
}
/** End loading configuration file */
/** Setting Chamilo paths */
@ -353,7 +353,6 @@ $app['this_section'] = SECTION_GLOBAL;
// include the local (contextual) parameters of this course or section
require $includePath.'/local.inc.php';
// Setting languages
$app['api_get_languages'] = api_get_languages();

@ -157,7 +157,6 @@ if ($intro_dispForm) {
$thematic_description_html = '';
if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
$thematic = new Thematic();
$thematic->set_course_int_id(api_get_course_int_id());
if (api_get_course_setting('display_info_advance_inside_homecourse') == '1') {

Loading…
Cancel
Save