Minor - cleaning whitespaces

skala
Julio Montoya 13 years ago
parent d31f38d7ec
commit f469e5120d
  1. 4
      main/admin/user_add.php
  2. 44
      main/auth/my_progress.php

@ -25,7 +25,7 @@ $is_platform_admin = api_is_platform_admin() ? 1 : 0;
$message = null; $message = null;
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/jquery.fcbkcomplete.js" type="text/javascript" language="javascript"></script>'; $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/jquery.fcbkcomplete.js" type="text/javascript" language="javascript"></script>';
$htmlHeadXtra[] = '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css" rel="stylesheet" type="text/css" />'; $htmlHeadXtra[] = '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css" rel="stylesheet" type="text/css" />';
$htmlHeadXtra[] = ' $htmlHeadXtra[] = '
<script> <script>
<!-- <!--
@ -270,7 +270,7 @@ if( $form->validate()) {
} }
if ($user['radio_expiration_date'] == '1') { if ($user['radio_expiration_date'] == '1') {
$expiration_date = $user['expiration_date']; $expiration_date = $user['expiration_date'];
} else { } else {
$expiration_date = '0000-00-00 00:00:00'; $expiration_date = '0000-00-00 00:00:00';
} }

@ -7,7 +7,6 @@
/** /**
* Code * Code
*/ */
// name of the language file that needs to be included // name of the language file that needs to be included
$language_file = array('registration', 'tracking', 'exercice', 'admin', 'learnpath'); $language_file = array('registration', 'tracking', 'exercice', 'admin', 'learnpath');
@ -15,7 +14,7 @@ $cidReset = true;
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpath.class.php'; require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpath.class.php';
require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php'; require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
$this_section = SECTION_TRACKING; $this_section = SECTION_TRACKING;
$nameTools = get_lang('MyProgress'); $nameTools = get_lang('MyProgress');
@ -26,20 +25,20 @@ $htmlHeadXtra[] = api_get_js('jquery.timelinr-0.9.5.js');
$htmlHeadXtra[] = ' $htmlHeadXtra[] = '
<script language="javascript"> <script language="javascript">
$(function() { $(function() {
$().timelinr(); $().timelinr();
$(".dialog").dialog("destroy"); $(".dialog").dialog("destroy");
$(".dialog").dialog({ $(".dialog").dialog({
autoOpen: false, autoOpen: false,
show: "blind", show: "blind",
resizable: false, resizable: false,
height:300, height:300,
width:550, width:550,
modal: true modal: true
}); });
$(".opener").click(function() { $(".opener").click(function() {
var my_id = $(this).attr(\'id\'); var my_id = $(this).attr(\'id\');
var big_image = \'#main_graph_\' + my_id; var big_image = \'#main_graph_\' + my_id;
$( big_image ).dialog("open"); $( big_image ).dialog("open");
return false; return false;
@ -54,32 +53,31 @@ $course_user_list = CourseManager::get_courses_list_by_user_id($user_id);
$dates = $issues = ''; $dates = $issues = '';
if (!empty($course_user_list)) { if (!empty($course_user_list)) {
$items = MySpace::get_connections_from_course_list($user_id, $course_user_list); $items = MySpace::get_connections_from_course_list($user_id, $course_user_list);
$first = null; $first = null;
$last = null; $last = null;
$last_item = count($items); $last_item = count($items);
$count = 1; $count = 1;
foreach ($items as $result) { foreach ($items as $result) {
$login = $result['login']; $login = $result['login'];
if ($count == 1) { if ($count == 1) {
$first = '<a href="#'.$login.'">'. get_lang('First').'</a>'; $first = '<a href="#'.$login.'">'.get_lang('First').'</a>';
} }
if ($count == $last_item) { if ($count == $last_item) {
$last = '<a href="#'.$login.'">'. get_lang('Last').'</a>'; $last = '<a href="#'.$login.'">'.get_lang('Last').'</a>';
} }
$course_info = api_get_course_info($result['course_code']); $course_info = api_get_course_info($result['course_code']);
$course_image = '<img src="'.$course_info['course_image'].'">'; $course_image = '<img src="'.$course_info['course_image'].'">';
$dates .= '<li><a href="#'.$login.'">'. api_get_utc_datetime($login).'</a></li>'; $dates .= '<li><a href="#'.$login.'">'.api_get_utc_datetime($login).'</a></li>';
$issues .= '<li id ="'.$login.'"> $issues .= '<li id ="'.$login.'">
<div class="row"> <div class="row">
<div class="span2"><div class="thumbnail">'.$course_image.'</div> <div class="span2"><div class="thumbnail">'.$course_image.'</div>
</div> </div>
<div class="span3">'.sprintf(get_lang('YouHaveEnteredTheCourseXInY') , $result['course_code'], api_convert_and_format_date($login, DATE_FORMAT_LONG)).'</div> <div class="span3">'.sprintf(get_lang('YouHaveEnteredTheCourseXInY'), $result['course_code'], api_convert_and_format_date($login, DATE_FORMAT_LONG)).'</div>
</li>'; </li>';
$count++; $count++;
} }
} }
$content .= Tracking::show_user_progress(api_get_user_id()); $content .= Tracking::show_user_progress(api_get_user_id());
@ -94,18 +92,15 @@ if (!empty($dates)) {
$content .= '<div id="my_timeline"> $content .= '<div id="my_timeline">
<div class="actions"> <div class="actions">
<a href="#" id="prev"></a> <!-- optional --> <a href="#" id="prev"></a> <!-- optional -->
<a href="#" id="next"></a> <!-- optional --> <a href="#" id="next"></a> <!-- optional -->
</div> </div>
<ul id="dates"> <ul id="dates">
'.$dates.' '.$dates.'
</ul> </ul>
<ul id="issues"> <ul id="issues">
'.$issues.' '.$issues.'
</ul> </ul>
</div></div>'; </div></div>';
} }
@ -115,7 +110,6 @@ if (empty($content)) {
$tpl = new Template($tool_name); $tpl = new Template($tool_name);
//$tpl->assign('actions', $actions);
$tpl->assign('message', $message); $tpl->assign('message', $message);
$tpl->assign('content', $content); $tpl->assign('content', $content);
$tpl->display_one_col_template(); $tpl->display_one_col_template();
Loading…
Cancel
Save