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

Format code, fix URL

Browse Source
1.10.x
Julio Montoya 11 years ago
parent b3b5535951
commit 2cc0e588be
8 changed files with 45 additions and 44 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. 2
      main/inc/lib/promotion.lib.php
  2. 2
      main/inc/lib/userportal.lib.php
  3. 4
      main/template/default/layout/topbar.tpl
  4. 4
      main/tracking/course_log_resources.php
  5. 4
      main/tracking/course_log_tools.php
  6. 6
      main/user/session_list.php
  7. 2
      main/wiki/index.php
  8. 35
      src/Chamilo/CoreBundle/Entity/Session.php

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

@ -146,7 +146,7 @@ class Promotion extends Model
echo '<div class="actions" style="margin-bottom:20px">'; echo '<div class="actions" style="margin-bottom:20px">';
echo '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>'; echo '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('new_promotion.png',get_lang('Add'),'','32').'</a>'; echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('new_promotion.png',get_lang('Add'),'','32').'</a>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_add.php">'.Display::return_icon('new_session.png',get_lang('AddSession'),'','32').'</a>'; echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png',get_lang('AddSession'),'','32').'</a>';
echo '</div>'; echo '</div>';
echo Display::grid_html('promotions'); echo Display::grid_html('promotions');
} }

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

@ -1423,7 +1423,7 @@ class IndexManager
$params['title'] = $session_category['session_category']['name']; $params['title'] = $session_category['session_category']['name'];
if (api_is_platform_admin()) { if (api_is_platform_admin()) {
$params['link'] = api_get_path(WEB_CODE_PATH).'admin/session_category_edit.php?&id='.$session_category['session_category']['id']; $params['link'] = api_get_path(WEB_CODE_PATH).'session/session_category_edit.php?&id='.$session_category['session_category']['id'];
} }
$session_category_start_date = $session_category['session_category']['date_start']; $session_category_start_date = $session_category['session_category']['date_start'];

4
main/template/default/layout/topbar.tpl
Unescape View File

@ -45,7 +45,7 @@
<li><a href="{{ _p.web_main }}admin/">{{ "Home"|get_lang }}</a></li> <li><a href="{{ _p.web_main }}admin/">{{ "Home"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}admin/user_list.php">{{ "UserList"|get_lang }}</a></li> <li><a href="{{ _p.web_main }}admin/user_list.php">{{ "UserList"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}admin/course_list.php">{{ "CourseList"|get_lang }}</a></li> <li><a href="{{ _p.web_main }}admin/course_list.php">{{ "CourseList"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}admin/session_list.php">{{ "SessionList"|get_lang }}</a></li> <li><a href="{{ _p.web_main }}session/session_list.php">{{ "SessionList"|get_lang }}</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a href="{{ _p.web_main }}admin/settings.php">{{ "Settings"|get_lang }}</a></li> <li><a href="{{ _p.web_main }}admin/settings.php">{{ "Settings"|get_lang }}</a></li>
<li class="divider"></li> <li class="divider"></li>
@ -59,7 +59,7 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="{{ _p.web_main }}admin/user_add.php">{{ "User"|get_lang }}</a></li> <li><a href="{{ _p.web_main }}admin/user_add.php">{{ "User"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}admin/course_add.php">{{ "Course"|get_lang }}</a></li> <li><a href="{{ _p.web_main }}admin/course_add.php">{{ "Course"|get_lang }}</a></li>
<li><a href="{{ _p.web_main }}admin/session_add.php">{{ "Session"|get_lang }}</a></li> <li><a href="{{ _p.web_main }}session/session_add.php">{{ "Session"|get_lang }}</a></li>
</ul> </ul>
</li> </li>
{% endif %} {% endif %}

4
main/tracking/course_log_resources.php
Unescape View File

@ -48,8 +48,8 @@ if (empty($session_id)) {
// Breadcrumbs. // Breadcrumbs.
if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') { if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php','name' => get_lang('PlatformAdmin')); $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php','name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/session_list.php','name' => get_lang('SessionList')); $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php','name' => get_lang('SessionList'));
$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview')); $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview'));
} }
$nameTools = get_lang('Tracking'); $nameTools = get_lang('Tracking');

4
main/tracking/course_log_tools.php
Unescape View File

@ -52,8 +52,8 @@ $csv_content = array();
// Breadcrumbs. // Breadcrumbs.
if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') { if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
$interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin')); $interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => '../admin/session_list.php','name' => get_lang('SessionList')); $interbreadcrumb[] = array('url' => '../session/session_list.php','name' => get_lang('SessionList'));
$interbreadcrumb[] = array('url' => '../admin/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview')); $interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview'));
} }
$view = (isset($_REQUEST['view']) ? $_REQUEST['view'] : ''); $view = (isset($_REQUEST['view']) ? $_REQUEST['view'] : '');

6
main/user/session_list.php
Unescape View File

@ -144,9 +144,9 @@ if($allowTutors == 'true') {
<?php if (api_is_platform_admin()) {?> <?php if (api_is_platform_admin()) {?>
<div class="actions"> <div class="actions">
<?php <?php
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_add.php">'.Display::return_icon('new_session.png',get_lang('AddSession'),'',ICON_SIZE_MEDIUM).'</a>'; echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png',get_lang('AddSession'),'',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png',get_lang('AddSessionsInCategories'),'',ICON_SIZE_MEDIUM).'</a>'; echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png',get_lang('AddSessionsInCategories'),'',ICON_SIZE_MEDIUM).'</a>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_category_list.php">'.Display::return_icon('folder.png',get_lang('ListSessionCategory'),'',ICON_SIZE_MEDIUM).'</a>'; echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.Display::return_icon('folder.png',get_lang('ListSessionCategory'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>'; echo '</div>';
} }
} else { } else {

2
main/wiki/index.php
Unescape View File

@ -7,7 +7,7 @@
* *
* @package chamilo.wiki * @package chamilo.wiki
*/ */
// including the global initialization file
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
require_once 'wiki.inc.php'; require_once 'wiki.inc.php';

35
src/Chamilo/CoreBundle/Entity/Session.php
Unescape View File

@ -4,9 +4,10 @@
namespace Chamilo\CoreBundle\Entity; namespace Chamilo\CoreBundle\Entity;
use Chamilo\UserBundle\Entity\User; use Chamilo\UserBundle\Entity\User;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Criteria; use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Doctrine\Common\Collections\ArrayCollection;
//use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; //use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
//use Gedmo\Mapping\Annotation as Gedmo; //use Gedmo\Mapping\Annotation as Gedmo;
@ -71,22 +72,6 @@ class Session
*/ */
private $duration; private $duration;
/**
* @return int
*/
public function getDuration()
{
return $this->duration;
}
/**
* @param int $duration
*/
public function setDuration($duration)
{
$this->duration = $duration;
}
/** /**
* @var integer * @var integer
* *
@ -265,6 +250,22 @@ class Session
$this->category = null; $this->category = null;
} }
/**
* @return int
*/
public function getDuration()
{
return $this->duration;
}
/**
* @param int $duration
*/
public function setDuration($duration)
{
$this->duration = $duration;
}
/** /**
* @return string * @return string
*/ */

Write Preview
Loading…
Cancel
Save