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

Styling: Improve display of buttons (one-line) in courses and sessions catalogue

Browse Source
pull/2487/head
Yannick Warnier 8 years ago
parent 55883ca7b3
commit 86bbf562d9
3 changed files with 75 additions and 61 deletions
  1. 2
      app/Resources/public/css/base.css
  2. 108
      main/auth/courses_categories.php
  3. 26
      main/template/default/auth/session_catalog.tpl

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

@ -4994,7 +4994,7 @@ div#chat-remote-video video {
}
/* Catalog session */
.return-catalog{
margin-bottom: 35px;
margin-top: 23px;
}
.search-session, .search-courses{
margin-bottom: 15px;

108
main/auth/courses_categories.php
Unescape View File

@ -66,65 +66,67 @@ $code = isset($code) ? $code : null;
<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 class="col-md-<?php echo ($showSessions ? '4' : '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>
</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']) : CoursesAndSessionsCatalog::PAGE_LENGTH;
$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>
<?php } ?>
</div>
<div class="col-md-<?php echo ($showSessions ? '4' : '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']) : CoursesAndSessionsCatalog::PAGE_LENGTH;
$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>
$form .= '</select>';
$form .= '</form>';
echo $form;
?>
</div>
</div>
<?php if ($showSessions) { ?>
<div class="col-md-4">
<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>
</div>
<?php } ?>
</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">

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

@ -14,7 +14,21 @@
<h2 class="title-session">{{ 'Sessions'|get_lang }}</h2>
<div class="search-session">
<div class="row">
{% if show_courses %}
<div class="col-md-4">
<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>
</div>
{% endif %}
{% if show_courses %}
<div class="col-md-4">
{% else %}
<div class="col-md-6">
{% endif %}
<form method="post" action="{{ _p.web_self }}?action=display_sessions">
<div class="form-group">
<label>{{ "ByDate"|get_lang }}</label>
@ -30,7 +44,12 @@
</div>
</form>
</div>
{% if show_courses %}
<div class="col-md-4">
{% else %}
<div class="col-md-6">
{% endif %}
<form method="post" action="{{ _p.web_self }}?action=search_tag">
<label>{{ "ByTag"|get_lang }}</label>
<div class="input-group">
@ -46,13 +65,6 @@
</div>
</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 -->

Write Preview
Loading…
Cancel
Save