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 pull request #1862 from aragonc/1.11.x

Browse Source 
Improvement in the catalog of courses
pull/2487/head
Alex Aragon Calixto 8 years ago committed by GitHub
parent 8db557c66f 536d52304a
commit cd6f858d4f
3 changed files with 98 additions and 80 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. 21
      app/Resources/public/css/base.css
  2. 127
      main/auth/courses_categories.php
  3. 30
      main/template/default/auth/session_catalog.tpl

21
app/Resources/public/css/base.css
Unescape View File

@ -4987,6 +4987,12 @@ div#chat-remote-video video {
margin-top: 15px;
margin-bottom: 15px;
}
.title-session,
.title-courses{
text-align: center;
font-weight: bold;
margin-bottom: 25px;
}
/* new grid catalog */
.section-course-wrapper{
-webkit-box-orient: horizontal;
@ -5007,10 +5013,16 @@ div#chat-remote-video video {
display: flex !important;
}
/* Catalog session */
.search-session{
margin-bottom: 30px;
.return-catalog{
margin-bottom: 35px;
padding-left: 15px;
padding-right: 15px;
}
.search-session, .search-courses{
margin-bottom: 15px;
margin-top: 25px;
padding-left: 15px;
padding-right: 15px;
}
.search-session .form-inline label{
font-weight: normal;
@ -6428,6 +6440,9 @@ ul#toolnavbox-two li a.btn{
margin-top: 10px;
padding-top: 10px;
}
.title-session{
font-size: 25px;
}
}

127
main/auth/courses_categories.php
Unescape View File

@ -62,69 +62,72 @@ $code = isset($code) ? $code : null;
});
</script>
<div class="row">
<div class="col-md-4">
<h5><?php echo get_lang('Search'); ?></h5>
<?php
if ($showCourses) {
if (!isset($_GET['hidden_links']) || intval($_GET['hidden_links']) != 1) { ?>
<form class="form-horizontal" method="post" action="<?php echo CourseCategory::getCourseCategoryUrl(1, $pageLength, 'ALL', 0, 'subscribe'); ?>">
<input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
<input type="hidden" name="search_course" value="1" />
<div class="input-group">
<input class="form-control" type="text" name="search_term" value="<?php echo (empty($_POST['search_term']) ? '' : api_htmlentities(Security::remove_XSS($_POST['search_term']))); ?>" />
<div class="input-group-btn">
<button class="btn btn-default" type="submit">
<em class="fa fa-search"></em> <?php echo get_lang('Search'); ?>
</button>
</div>
</div>
</form>
<?php } ?>
</div>
<div class="col-md-4">
<h5><?php echo get_lang('CourseCategories'); ?></h5>
<?php
$webAction = api_get_path(WEB_CODE_PATH).'auth/courses.php';
$action = (!empty($_REQUEST['action']) ? Security::remove_XSS($_REQUEST['action']) : 'display_courses');
$pageLength = (!empty($_REQUEST['pageLength']) ? intval($_REQUEST['pageLength']) : 10);
$pageCurrent = (!empty($_REQUEST['pageCurrent']) ? intval($_REQUEST['pageCurrent']) : 1);
$form = '<form action="'.$webAction.'" method="GET" class="form-horizontal">';
$form .= '<input type="hidden" name="action" value="' . $action . '">';
$form .= '<input type="hidden" name="pageCurrent" value="' . $pageCurrent . '">';
$form .= '<input type="hidden" name="pageLength" value="' . $pageLength . '">';
$form .= '<div class="form-group">';
$form .= '<div class="col-sm-12">';
$form .= '<select name="category_code" onchange="submit();" class="selectpicker show-tick form-control">';
$codeType = isset($_REQUEST['category_code']) ? Security::remove_XSS($_REQUEST['category_code']) : '';
foreach ($browse_course_categories[0] as $category) {
$categoryCode = $category['code'];
$countCourse = $category['count_courses'];
$form .= '<option '. ($categoryCode == $codeType? 'selected="selected" ':'') .' value="' . $category['code'] . '">' . $category['name'] . ' ( '. $countCourse .' ) </option>';
if (!empty($browse_course_categories[$categoryCode])) {
foreach ($browse_course_categories[$categoryCode] as $subCategory){
$subCategoryCode = $subCategory['code'];
$form .= '<option '. ($subCategoryCode == $codeType ? 'selected="selected" ':'') .' value="' . $subCategory['code'] . '"> ---' . $subCategory['name'] . ' ( '. $subCategory['count_courses'] .' ) </option>';
}
}
}
$form .= '</select>';
$form .= '</div>';
$form .= '</form>';
echo $form;
?>
</div>
</div>
<?php
if ($showSessions) { ?>
<div class="col-md-4">
<h5><?php echo get_lang('Sessions'); ?></h5>
<a class="btn btn-default btn-block" href="<?php echo CourseCategory::getCourseCategoryUrl(1, $pageLength, null, 0, 'display_sessions'); ?>">
<?php echo get_lang('SessionList'); ?>
</a>
</div>
<?php } ?>
<div class="col-md-12">
<h2 class="title-courses"><?php echo get_lang('CourseManagement'); ?></h2>
<div class="search-courses">
<div class="row">
<div class="col-md-6">
<?php
if ($showCourses) {
if (!isset($_GET['hidden_links']) || intval($_GET['hidden_links']) != 1) { ?>
<form method="post" action="<?php echo CourseCategory::getCourseCategoryUrl(1, $pageLength, 'ALL', 0, 'subscribe'); ?>">
<input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
<input type="hidden" name="search_course" value="1" />
<label><?php echo get_lang('Search'); ?></label>
<div class="input-group">
<input class="form-control" type="text" name="search_term" value="<?php echo (empty($_POST['search_term']) ? '' : api_htmlentities(Security::remove_XSS($_POST['search_term']))); ?>" />
<div class="input-group-btn">
<button class="btn btn-default" type="submit">
<em class="fa fa-search"></em> <?php echo get_lang('Search'); ?>
</button>
</div>
</div>
</form>
<?php } ?>
</div>
<div class="col-md-6">
<?php
$webAction = api_get_path(WEB_CODE_PATH).'auth/courses.php';
$action = (!empty($_REQUEST['action']) ? Security::remove_XSS($_REQUEST['action']) : 'display_courses');
$pageLength = (!empty($_REQUEST['pageLength']) ? intval($_REQUEST['pageLength']) : 10);
$pageCurrent = (!empty($_REQUEST['pageCurrent']) ? intval($_REQUEST['pageCurrent']) : 1);
$form = '<form action="'.$webAction.'" method="GET" >';
$form .= '<input type="hidden" name="action" value="' . $action . '">';
$form .= '<input type="hidden" name="pageCurrent" value="' . $pageCurrent . '">';
$form .= '<input type="hidden" name="pageLength" value="' . $pageLength . '">';
$form .= '<div class="form-group">';
$form .= '<label>'.get_lang('CourseCategories').'</label>';
$form .= '<select name="category_code" onchange="submit();" class="selectpicker show-tick form-control">';
$codeType = isset($_REQUEST['category_code']) ? Security::remove_XSS($_REQUEST['category_code']) : '';
foreach ($browse_course_categories[0] as $category) {
$categoryCode = $category['code'];
$countCourse = $category['count_courses'];
$form .= '<option '. ($categoryCode == $codeType? 'selected="selected" ':'') .' value="' . $category['code'] . '">' . $category['name'] . ' ( '. $countCourse .' ) </option>';
if (!empty($browse_course_categories[$categoryCode])) {
foreach ($browse_course_categories[$categoryCode] as $subCategory){
$subCategoryCode = $subCategory['code'];
$form .= '<option '. ($subCategoryCode == $codeType ? 'selected="selected" ':'') .' value="' . $subCategory['code'] . '"> ---' . $subCategory['name'] . ' ( '. $subCategory['count_courses'] .' ) </option>';
}
}
}
$form .= '</select>';
$form .= '</form>';
echo $form;
?>
</div>
</div>
</div>
</div>
<?php if ($showSessions) { ?>
<div class="return-catalog">
<a class="btn btn-default btn-lg btn-block" href="<?php echo CourseCategory::getCourseCategoryUrl(1, $pageLength, null, 0, 'display_sessions'); ?>">
<em class="fa fa-arrow-right"></em> <?php echo get_lang('SessionList'); ?>
</a>
</div>
<?php } ?>
</div>
<?php } ?>
<div class="grid-courses">
<div class="row">

30
main/template/default/auth/session_catalog.tpl
Unescape View File

@ -10,11 +10,12 @@
</script>
<div class="row">
<div class="col-md-12">
<h3 class="page-header">{{ 'Sessions'|get_lang }}</h3>
<div class="search-session">
<!-- header catalog session -->
<h2 class="title-session">{{ 'Sessions'|get_lang }}</h2>
<div class="search-session">
<div class="row">
<div class="col-md-{{ show_courses ? '4' : '6' }}">
<form class="form-inline" method="post" action="{{ _p.web_self }}?action=display_sessions">
<div class="col-md-6">
<form method="post" action="{{ _p.web_self }}?action=display_sessions">
<div class="form-group">
<label>{{ "ByDate"|get_lang }}</label>
<div class="input-group">
@ -29,8 +30,8 @@
</div>
</form>
</div>
<div class="col-md-{{ show_courses ? '4' : '6' }}">
<form class="form-inline" method="post" action="{{ _p.web_self }}?action=search_tag">
<div class="col-md-6">
<form method="post" action="{{ _p.web_self }}?action=search_tag">
<label>{{ "ByTag"|get_lang }}</label>
<div class="input-group">
<input type="text" name="search_tag" title="{{ 'ByTag'|get_lang }}" class="form-control"
@ -43,16 +44,15 @@
</div>
</form>
</div>
{% if show_courses %}
<div class="col-md-4">
<a class="btn btn-default btn-block" href="{{ _p.web_self }}">
{{ "CourseManagement"|get_lang }}
</a>
</div>
{% endif %}
</div>
</div>
{% if show_courses %}
<div class="return-catalog">
<a class="btn btn-default btn-lg btn-block" href="{{ _p.web_self }}">
<em class="fa fa-arrow-left"></em> {{ "CourseManagement"|get_lang }}
</a>
</div>
{% endif %}
</div>
</div>
<!-- new view session grib -->
@ -60,7 +60,7 @@
<div class="grid-courses col-md-12">
<div class="row">
{% for item in sessions %}
<div class="col-md-4 col-sm-6 col-xs-6">
<div class="col-md-4 col-sm-6 col-xs-12">
<div id="session-{{ item.id }}" class="items items-courses">
<div class="image">
<a href="{{ _p.web ~ 'session/' ~ item.id ~ '/about/' }}" title="{{ item.name }}">

Write Preview
Loading…
Cancel
Save