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

Some fixes in the course catalog

Browse Source
skala
Julio Montoya 15 years ago
parent cf4240db8c
commit 348e8ecbdb
6 changed files with 152 additions and 42 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/auth/courses.php
  2. 8
      main/auth/courses_controller.php
  3. 134
      main/css/base.css
  4. 6
      main/inc/lib/auth.lib.php
  5. 2
      main/inc/lib/search/search_widget.css
  6. 42
      main/template/default/auth/courses_categories.php

2
main/auth/courses.php
Unescape View File

@ -24,6 +24,7 @@ require_once api_get_path(LIBRARY_PATH).'course.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
// additional html (javascript and style css)
$htmlHeadXtra[] = '<script type="text/javascript">' .
'var GB_ROOT_DIR = "'.api_get_path(WEB_LIBRARY_PATH).'javascript/greybox/"' .
@ -35,6 +36,7 @@ if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
$htmlHeadXtra[] = '<link href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/greybox/gb_styles.css" rel="stylesheet" type="text/css" />';
}
// Section for the tabs.
$this_section = SECTION_COURSES;

8
main/auth/courses_controller.php
Unescape View File

@ -89,15 +89,12 @@ class CoursesController { // extends Controller {
* @param string Category code (optional)
*/
public function courses_categories($action, $category_code = null, $message = '', $error = '') {
$data = array();
$browse_course_categories = $this->model->browse_course_categories();
if (!isset($category_code)) {
$category_code = $browse_course_categories[0][1]['code']; // by default first category
}
}
$data['browse_courses_in_category'] = $this->model->browse_courses_in_category($category_code);
$data['browse_course_categories'] = $browse_course_categories;
$data['code'] = Security::remove_XSS($category_code);
@ -126,11 +123,10 @@ class CoursesController { // extends Controller {
$this->view->set_layout('layout');
$this->view->set_template('courses_categories');
$this->view->render();
}
/**
*
* Search courses
*/
public function search_courses($search_term, $message = '', $error = '') {

134
main/css/base.css
Unescape View File

@ -5,6 +5,7 @@
* {
outline :none;
}
input {
-moz-border-radius:5px;
-webkit-border-radius:5px;
@ -140,19 +141,23 @@ input.maininput:focus {
box-shadow: 0 -1px 10px 2px #CCCCCC;
border:1px solid #CCCCCC;
float:left;
margin:10px;
margin:8px;
width:240px;
min-height:132px;
padding:25px;
padding:18px;
font-size:11pt;
}
#categories-content-second {
margin-left: 315px;
margin-left: 308px;
//padding:5px;
margin-top:5px;
}
.course-block-main-item {
height:32px;
}
.categories-block-course {
-moz-border-radius-topleft:8px;
-moz-border-radius-topright:8px;
@ -166,8 +171,8 @@ input.maininput:focus {
border:1px solid #CCCCCC;
float:left;
margin:10px;
padding:9px;
width:220px;
padding:12px;
width:240px;
min-height:180px;
color: #BBBBBB;
}
@ -212,12 +217,14 @@ input.maininput:focus {
font-style: italic;
text-align: right;
color: #444444;
line-height: 10px;
}
.categories-course-description .course-block-date {
font-size: large;
font-style: italic;
text-align: right;
color: #444444;
line-height: 10px;
}
.course-block-popularity {
width: 90px;
@ -247,16 +254,18 @@ input.maininput:focus {
}
.categories-course-links {
margin-top:5px;
height: 25px;
margin-top:20px;
height:16px;
padding:2px;
}
.course-link-desc a {
text-decoration:underline;
.course-link-desc {
//padding:10px 10px 0px;
float:left;
}
.course-link-desc span {
padding-top:10px;
}
.attendance-users-table td {
@ -472,4 +481,107 @@ table.lp_build td.tree {
/* fixes bug in ie7 */
#menu {
width:180px;
}
}
/* Nice buttons*/
.left {
float:left;
}
.right {
float:right;
}
.a_button {
display: inline-block;
zoom: 1; /* zoom and *display = ie7 hack for display:inline-block */
display: inline;
vertical-align: baseline;
margin: 0 2px;
outline: none;
cursor: pointer;
text-align: center;
text-decoration: none;
font: 14px/100% Arial, Helvetica, sans-serif;
padding: .5em 2em .55em;
text-shadow: 0 1px 1px rgba(0,0,0,.3);
-webkit-border-radius: .5em;
-moz-border-radius: .5em;
border-radius: .5em;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);
box-shadow: 0 1px 2px rgba(0,0,0,.2);
}
.a_button:hover {
text-decoration: none;
}
.a_button:active {
position: relative;
top: 1px;
}
.bigrounded {
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius: 2em;
}
.medium {
font-size: 12px;
padding: .4em 1.5em .42em;
}
.small {
font-size: 11px;
padding: .2em 1em .275em;
}
/* white */
.a_button .white {
color: #606060;
}
.white {
color: #606060 !important;
border: solid 1px #b7b7b7;
background: #fff;
background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
background: -moz-linear-gradient(top, #fff, #ededed);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed');
}
.white:hover {
color: #606060;
background: #ededed;
background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#dcdcdc));
background: -moz-linear-gradient(top, #fff, #dcdcdc);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dcdcdc');
}
.white:active {
color: #999;
background: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
background: -moz-linear-gradient(top, #ededed, #fff);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#ffffff');
}
/* orange */
.orange {
color: #fef4e9 !important;
border: solid 1px #da7c0c;
background: #f78d1d;
background: -webkit-gradient(linear, left top, left bottom, from(#faa51a), to(#f47a20));
background: -moz-linear-gradient(top, #faa51a, #f47a20);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#faa51a', endColorstr='#f47a20');
}
.orange:hover {
color: #fef4e9;
background: #f47c20;
background: -webkit-gradient(linear, left top, left bottom, from(#f88e11), to(#f06015));
background: -moz-linear-gradient(top, #f88e11, #f06015);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f88e11', endColorstr='#f06015');
}
.orange:active {
color: #fcd3a5;
background: -webkit-gradient(linear, left top, left bottom, from(#f47a20), to(#faa51a));
background: -moz-linear-gradient(top, #f47a20, #faa51a);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f47a20', endColorstr='#faa51a');
}

6
main/inc/lib/auth.lib.php
Unescape View File

@ -470,10 +470,14 @@ class Auth
$result = Database::query($sql);
$courses = array();
while ($row = Database::fetch_array($result)) {
while ($row = Database::fetch_array($result)) {
$row['registration_code'] = !empty($row['registration_code']);
$count_users = count(CourseManager::get_user_list_from_course_code($row['code']));
$count_connections_last_month = Tracking::get_course_connections_count($row['code'], 0, api_get_utc_datetime(time()-(30*86400)));
if ($row['tutor_name'] == '0') {
$row['tutor_name'] = get_lang('NoManager');
}
$courses[] = array(
'code' => $row['code'],
'directory' => $row['directory'],

2
main/inc/lib/search/search_widget.css
Unescape View File

@ -74,7 +74,7 @@
clear:both
}
#search-results-container {
width: 940px;
width: 100%;
border: 1px solid #979797;
position: relative;
background-image: url('/main/img/search_background_bar.jpg');

42
main/template/default/auth/courses_categories.php
Unescape View File

@ -113,9 +113,9 @@ $stok = Security::get_token();
if (!empty($browse_courses_in_category)) {
foreach ($browse_courses_in_category as $course) {
$title = $course['title'];
$title = $course['title'];
$tutor_name = $course['tutor'];
$creation_date = substr($course['creation_date'],0,10);
$count_connections = $course['count_connections'];
@ -130,36 +130,32 @@ $stok = Security::get_token();
echo '<div class="categories-block-course">
<div class="categories-content-course">
<div class="categories-course-description">
<div class="course-block-title">'.strtoupper($title).'</div>
<div>'.get_lang('Teacher').'</div><div class="course-block-teacher">'.$tutor_name.'</div>
<div>'.get_lang('CreationDate').'</div><div class="course-block-date">'.api_format_date($creation_date,DATE_FORMAT_SHORT).'</div>
<div class="course-block-main-item"><div class="left">'.get_lang('Teacher').'</div><div class="course-block-teacher right">'.$tutor_name.'</div></div>
<div class="course-block-main-item"><div class="left">'.get_lang('CreationDate').'</div><div class="course-block-date">'.api_format_date($creation_date,DATE_FORMAT_SHORT).'</div></div>
</div>
<div class="categories-course-picture">
<img src="'.$course_medium_image.'" />
</div>
<div class="course-block-popularity"><span>'.get_lang('ConnectionsLastMonth').'</span><div class="course-block-popularity-score">'.$count_connections.'</div></div>
</div>
<div style="clear:both;"></div>
<div class="categories-course-links">';
// we display the icon to subscribe or the text already subscribed
if (!in_array($course['code'], $user_coursecodes)) {
if ($course['subscribe'] == SUBSCRIBE_ALLOWED) {
echo '<span class="course-link-desc"><a href="'. api_get_self().'?action=subscribe_course&amp;sec_token='.$stok.'&amp;subscribe_course='.$course['code'].'&amp;search_term='.$search_term.'&amp;category_code='.$code.'">'.get_lang('Subscribe').'</a></span>';
}
<div class="course-block-popularity"><span>'.get_lang('ConnectionsLastMonth').'</span><div class="course-block-popularity-score">'.$count_connections.'</div></div>';
echo '</div>';
echo '<div class="categories-course-links">';
// we display the icon to subscribe or the text already subscribed
if (!in_array($course['code'], $user_coursecodes)) {
if ($course['subscribe'] == SUBSCRIBE_ALLOWED) {
echo '<div class="course-link-desc left"><a class="a_button orange medium" href="'. api_get_self().'?action=subscribe_course&amp;sec_token='.$stok.'&amp;subscribe_course='.$course['code'].'&amp;search_term='.$search_term.'&amp;category_code='.$code.'">'.get_lang('Subscribe').'</a></div>';
}
if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
echo '<span class="course-link-desc"><a href="'.api_get_path(WEB_CODE_PATH).'inc/ajax/course_home.ajax.php?a=show_course_information&amp;code='.$course['code'].'" title="'.$icon_title.'" rel="gb_page_center[778]">'.get_lang('CourseDetails').'</a></span>';
}
echo '</div>
</div>';
}
if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
echo '<div class="course-link-desc right"><a class="a_button white small" href="'.api_get_path(WEB_CODE_PATH).'inc/ajax/course_home.ajax.php?a=show_course_information&amp;code='.$course['code'].'" title="'.$icon_title.'" rel="gb_page_center[778]">'.get_lang('CourseDetails').'</a></div>';
}
echo '</div>';
echo '</div>';
}
} else {
echo '<div id="course-message">'.get_lang('ThereAreNoCoursesInThisCategory').'</div>';
echo Display::display_warning_message(get_lang('ThereAreNoCoursesInThisCategory'));
}
?>
<div class="clear"></div>

Write Preview
Loading…
Cancel
Save