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 branch 'BT9889-tademi' into tademi

Browse Source
aragonc 11 years ago
parent a3ed68acaf 8118db5dcc
commit 51554b13be
3 changed files with 390 additions and 180 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. 89
      app/Resources/public/css/themes/games/default.css
  2. 358
      main/template/games/auth/session_catalog.tpl
  3. 123
      main/template/games/session/about.tpl

89
app/Resources/public/css/themes/games/default.css
Unescape View File

@ -18,6 +18,16 @@
padding-top: 15px;
padding-left: 15px;
}
.page-header{
margin: 10px 0px 10px;
border: none;
}
.page-header h1{
margin-top: 10px;
font-size: 22px;
text-transform: uppercase;
color: #E73858;
}
.my-courses-ranking .title-course,
#slider-sessions .title-course{
font-size: 14px;
@ -108,15 +118,19 @@
background-color: #35a8c9;
border-radius: 5px;
border-color: #35a8c9;
padding-left: 30px;
padding-right: 30px;
padding-left: 10px;
padding-right: 10px;
}
.btn-primary:hover{
background-color: #2593b3;
border-radius: 5px;
border-color: #2593b3;
padding-left: 30px;
padding-right: 30px;
padding-left: 10px;
padding-right: 10px;
}
#breadcrumb-bar .btn{
margin-top: 5px;
margin-right: 5px;
}
/* ranting */
.start-progress .fa-star {
@ -250,6 +264,73 @@ footer .media{
padding-left: 10px;
display: inline-block;
}
#about-session .tags-course{
background-color: #ffffff;
}
#about-session .tags-course .fa-check-square-o{
font-size: 25px;
color: #35a8c8;
}
#about-session .subscribe{
text-align: right;
}
#about-session .description-course{
text-align: justify;
}
#about-session .subscribe .btn-success{
background-color: #E73858;
text-transform: uppercase;
border: none;
border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
}
#about-session .subscribe .btn-success:hover{
background-color: #d02646;
}
#about-session .tags-course a{
color: #555555;
font-size: 16px;
}
#about-session .title-section{
text-transform: uppercase;
color: #E73858;
}
#about-session .objective-course .fa-square{
color: #35A8C9;
}
#about-session .topics .fa-square{
color: #E73858;
}
#about-session .title-info{
padding-bottom: 20px;
margin-bottom: 20px;
color: #666666;
}
#about-session .content-info{
padding-bottom: 20px;
margin-bottom: 10px;
color:#666666;
text-align: justify;
}
#about-session .teachers .heading, #about-session .social-share .heading{
color: #42adcc;
}
#about-session .teachers{
padding-top: 20px;
}
#about-session .btn-social{
background-color: #e3c200;
width: 45px;
height: 45px;
display: inline-block;
border-radius: 50%;
font-size: 26px;
color: #ffffff;
}
#about-session .btn-social:hover{
background-color: #d9b800;
}
/* Large desktop */
@media (min-width: 1200px) {
.container{

358
main/template/games/auth/session_catalog.tpl
Unescape View File

@ -1,216 +1,222 @@
{% extends template ~ "/layout/main.tpl" %}
{% block body %}
<script type="text/javascript">
$(document).ready(function () {
$('#date').datepicker({
dateFormat: 'yy-mm-dd'
});
$('a[data-session]').on('click', function (e) {
e.preventDefault();
var link = $(this),
sessionId = parseInt(link.data('session')),
collapsible = $('#collapse-' + sessionId),
courseList = link.data('courses') || [];
<script type="text/javascript">
$(document).ready(function () {
$('#date').datepicker({
dateFormat: 'yy-mm-dd'
});
if (courseList.length === 0) {
var getCourseList = $.getJSON(
'{{ _p.web_ajax }}course.ajax.php',
{
a: 'display_sessions_courses',
session: sessionId
}
);
$('a[data-session]').on('click', function (e) {
e.preventDefault();
$.when(getCourseList).done(function (courses) {
courseList = courses;
link.data('courses', courses);
var link = $(this),
sessionId = parseInt(link.data('session')),
collapsible = $('#collapse-' + sessionId),
courseList = link.data('courses') || [];
var coursesUL = '';
if (courseList.length === 0) {
var getCourseList = $.getJSON(
'{{ _p.web_ajax }}course.ajax.php',
{
a: 'display_sessions_courses',
session: sessionId
}
);
$.each(courseList, function (index, course) {
coursesUL += '<li><img src="{{ _p.web }}main/img/check.png"/> <strong>' + course.name + '</strong>';
$.when(getCourseList).done(function (courses) {
courseList = courses;
link.data('courses', courses);
if (course.coachName !== '') {
coursesUL += ' (' + course.coachName + ')';
}
var coursesUL = '';
coursesUL += '</li>';
});
$.each(courseList, function (index, course) {
coursesUL += '<li><img src="{{ _p.web }}main/img/check.png"/> <strong>' + course.name + '</strong>';
collapsible.html('<div class="panel-body"><ul class="list-unstyled items-session">' + coursesUL + '</ul></div>');
if (course.coachName !== '') {
coursesUL += ' (' + course.coachName + ')';
}
collapsible.collapse('show');
coursesUL += '</li>';
});
} else {
collapsible.collapse('toggle');
}
});
$('.collapse').collapse('hide');
collapsible.html('<div class="panel-body"><ul class="list-unstyled items-session">' + coursesUL + '</ul></div>');
collapsible.collapse('show');
});
} else {
collapsible.collapse('toggle');
}
});
</script>
<div class="col-md-3">
{% if show_courses %}
<div class="panel panel-default">
<div class="panel-heading">{{ "Courses"|get_lang }}</div>
<div class="panel-body">
{% if not hidden_links %}
<div class="row">
<div class="col-xs-12">
<form class="form-search" method="post" action="{{ course_url }}">
<div class="input-group">
<input type="text" name="search_term" class="form-control" />
<input type="hidden" name="sec_token" value="{{ search_token }}">
<input type="hidden" name="search_course" value="1" />
$('.collapse').collapse('hide');
});
</script>
<div class="col-md-3">
{% if show_courses %}
<div class="panel panel-default">
<div class="panel-heading">{{ "Courses"|get_lang }}</div>
<div class="panel-body">
{% if not hidden_links %}
<div class="row">
<div class="col-xs-12">
<form class="form-search" method="post" action="{{ course_url }}">
<div class="input-group">
<input type="text" name="search_term" class="form-control" />
<input type="hidden" name="sec_token" value="{{ search_token }}">
<input type="hidden" name="search_course" value="1" />
<span class="input-group-btn">
<button class="btn btn-default" type="submit"><i class="fa fa-search"></i> {{ 'Search'|get_lang }}</button>
</span>
</div>
</form>
</div>
</div>
{% endif %}
{% if course_category_list is not empty %}
<br>
<a class="btn btn-block btn-default" href="{{ _p.web_self }}?action=display_random_courses">{{ 'RandomPick'|get_lang }}</a>
{% endif %}
</form>
</div>
</div>
{% endif %}
{% if coursesCategoriesList is not empty %}
<div class="sidebar-nav">
<div class="panel panel-default">
<div class="panel-heading">
{{ 'CourseCategories'|get_lang }}
</div>
<div class="panel-body">
<ul class="list-categories">
{{ coursesCategoriesList }}
</ul>
</div>
</div>
</div>
{% if course_category_list is not empty %}
<br>
<a class="btn btn-block btn-default" href="{{ _p.web_self }}?action=display_random_courses">{{ 'RandomPick'|get_lang }}</a>
{% endif %}
{% endif %}
</div>
</div>
{% if show_sessions %}
<div class="sidebar-nav">
<div class="panel panel-default">
<div class="panel-heading">
{{ 'Sessions'|get_lang }}
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-12">
<form class="form-search" method="post" action="{{ _p.web_self }}?action=display_sessions">
<fieldset>
<legend>{{ "ByDate"|get_lang }}</legend>
<div class="input-group">
<input type="date" name="date" id="date" class="form-control" value="{{ search_date }}" readonly>
{% if coursesCategoriesList is not empty %}
<div class="sidebar-nav">
<div class="panel panel-default">
<div class="panel-heading">
{{ 'CourseCategories'|get_lang }}
</div>
<div class="panel-body">
<ul class="list-categories">
{{ coursesCategoriesList }}
</ul>
</div>
</div>
</div>
{% endif %}
{% endif %}
{% if show_sessions %}
<div class="sidebar-nav">
<div class="panel panel-default">
<div class="panel-heading">
{{ 'Sessions'|get_lang }}
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-12">
<form class="form-search" method="post" action="{{ _p.web_self }}?action=display_sessions">
<fieldset>
<legend>{{ "ByDate"|get_lang }}</legend>
<div class="input-group">
<input type="date" name="date" id="date" class="form-control" value="{{ search_date }}" readonly>
<span class="input-group-btn">
<button class="btn btn-default" type="submit"><i class="fa fa-search"></i> {{ 'Search'|get_lang }}</button>
</span>
</div>
</fieldset>
</form>
<br>
<form class="form-search" method="post" action="{{ _p.web_self }}?action=search_tag">
<fieldset>
<legend>{{ "ByTag"|get_lang }}</legend>
<div class="input-group">
<input type="text" name="search_tag" class="form-control" value="{{ search_tag }}" />
</div>
</fieldset>
</form>
<br>
<form class="form-search" method="post" action="{{ _p.web_self }}?action=search_tag">
<fieldset>
<legend>{{ "ByTag"|get_lang }}</legend>
<div class="input-group">
<input type="text" name="search_tag" class="form-control" value="{{ search_tag }}" />
<span class="input-group-btn">
<button class="btn btn-default" type="submit"><i class="fa fa-search"></i> {{ 'Search'|get_lang }}</button>
</span>
</div>
</fieldset>
</form>
</div>
</div>
</div>
</fieldset>
</form>
</div>
</div>
</div>
{% endif %}
</div>
</div>
<div class="col-md-9">
{% for session in sessions %}
<div class="panel panel-default" id="panel-{{ session.id }}">
<div class="panel-heading">
{{ session.icon }} {{ session.name }}
</div>
<div class="panel-body">
<div class="row">
<div class="col-md-9">
{% if show_tutor %}
<p class="tutor">
<img src="{{ 'teacher.png' | icon(22) }}" width="16">
{{ 'GeneralCoach'|get_lang }} {{ session.coach_name }}
</p>
{% endif %}
{% if session.requirements %}
<h4>{{ 'Requirements'|get_lang }}</h4>
<p>
{% for requirement in session.requirements %}
{{ requirement.name }}
{% endfor %}
</p>
{% endif %}
{% if session.dependencies %}
<h4>{{ 'Dependencies'|get_lang }}</h4>
<p>
{% for dependency in session.dependencies %}
{{ dependency.name }}
{% endfor %}
</p>
{% endif %}
<div class="panel-group" role="tablist">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="heading-session-{{ session.id }}">
<h4 class="panel-title">
<a class="collapsed" data-session="{{ session.id }}" data-toggle="false" href="#collapse-{{ session.id }}" aria-expanded="true" aria-controls="collapse-{{ session.id }}">
{{ 'CourseList'|get_lang }}
</a>
</h4>
</div>
<div id="collapse-{{ session.id }}" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading-session-{{ session.id }}"></div>
</div>
</div>
</div>
<div class="col-md-3">
{% if session.show_description %}
<p class="buttom-subscribed">
<a class="ajax btn btn-large btn-info" href="{{ _p.web_ajax }}session.ajax.php?a=get_description&session={{ session.id }}">
{{ 'Description'|get_lang }}
{% endif %}
</div>
<div class="col-md-9">
{% for session in sessions %}
<div class="panel panel-default" id="panel-{{ session.id }}">
<div class="panel-heading">
{{ session.icon }} {{ session.name }}
</div>
<div class="panel-body">
<div class="row">
<div class="col-md-9">
{% if show_tutor %}
<p class="tutor">
<img src="{{ 'teacher.png' | icon(22) }}" width="16">
{{ 'GeneralCoach'|get_lang }} {{ session.coach_name }}
</p>
{% endif %}
{% if session.requirements %}
<h4>{{ 'Requirements'|get_lang }}</h4>
<p>
{% for requirement in session.requirements %}
{{ requirement.name }}
{% endfor %}
</p>
{% endif %}
{% if session.dependencies %}
<h4>{{ 'Dependencies'|get_lang }}</h4>
<p>
{% for dependency in session.dependencies %}
{{ dependency.name }}
{% endfor %}
</p>
{% endif %}
<div class="panel-group" role="tablist">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="heading-session-{{ session.id }}">
<h4 class="panel-title">
<a class="collapsed" data-session="{{ session.id }}" data-toggle="false" href="#collapse-{{ session.id }}" aria-expanded="true" aria-controls="collapse-{{ session.id }}">
{{ 'CourseList'|get_lang }}
</a>
</p>
{% endif %}
<p class="buttom-subscribed">
{% if session.is_subscribed %}
{{ already_subscribed_label }}
{% else %}
{{ session.subscribe_button }}
{% endif %}
</p>
<p class="time">
<img src="{{ 'agenda.png' | icon(22) }}"> {{ session.date }}
</p>
</h4>
</div>
<div id="collapse-{{ session.id }}" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading-session-{{ session.id }}"></div>
</div>
</div>
</div>
<div class="col-md-3">
{% if session.show_description %}
<p class="buttom-subscribed">
<a class="ajax btn btn-large btn-info" href="{{ _p.web_ajax }}session.ajax.php?a=get_description&session={{ session.id }}">
{{ 'Description'|get_lang }}
</a>
</p>
{% endif %}
<p>
<a href="{{ _p.web ~ 'session/' ~ session.id ~ '/about/' }}" class="btn btn-block btn-info">
<i class="fa fa-info-circle"></i> {{ "SeeInformation"|get_lang }}
</a>
</p>
<p class="buttom-subscribed">
{% if session.is_subscribed %}
{{ already_subscribed_label }}
{% else %}
{{ session.subscribe_button }}
{% endif %}
</p>
<p class="time">
<img src="{{ 'agenda.png' | icon(22) }}"> {{ session.date }}
</p>
</div>
</div>
{% else %}
{{ message }}
{% endfor %}
{{ catalog_pagination }}
</div>
</div>
{% else %}
{{ message }}
{% endfor %}
{{ catalog_pagination }}
</div>
{% endblock %}
{% endblock %}

123
main/template/games/session/about.tpl
Unescape View File

@ -0,0 +1,123 @@
<div id="about-session">
{% for course_data in courses %}
{% if courses|length > 1 %}
<div class="row">
<div class="col-xs-12">
<h2 class="text-uppercase">{{ course_data.course.getTitle }}</h2>
</div>
</div>
{% endif %}
<div class="row">
{% if course_data.video %}
<div class="col-sm-6 col-md-7">
<div class="embed-responsive embed-responsive-16by9">
{{ course_data.video }}
</div>
</div>
{% endif %}
<div class="{{ course_data.video ? 'col-sm-6 col-md-5' : 'col-sm-12' }}">
<div class="description-course">
{{ course_data.description.getContent }}
</div>
{% if course_data.tags %}
<div class="tags-course">
<i class="fa fa-check-square-o"></i>
{% for tag in course_data.tags %}
<a href="#">{{ tag.getTag }}</a>
{% endfor %}
</div>
{% endif %}
<div class="subscribe">
<a href="#" class="btn btn-success">{{ "Subscribe"|get_lang }}</a>
</div>
</div>
</div>
<div class="row info-course">
<div class="col-xs-12 col-md-12">
<h4 class="title-section">{{ "CourseInformation"|get_lang }}</h4>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-7">
<div class="panel-body">
{% if course_data.objectives %}
<div class="objective-course">
<h4 class="title-info"><i class="fa fa-square"></i> {{ "Objectives"|get_lang }}</h4>
<div class="content-info">
{{ course_data.objectives.getContent }}
</div>
</div>
{% endif %}
{% if course_data.topics %}
<div class="topics">
<h4 class="title-info"><i class="fa fa-square"></i> {{ "Topics"|get_lang }}</h4>
<div class="content-info">
{{ course_data.topics.getContent }}
</div>
</div>
{% endif %}
</div>
</div>
<div class="col-xs-12 col-md-5">
{% if course_data.coaches %}
<div class="teachers">
<div class="heading">
<h4>{{ "Coaches"|get_lang }}</h4>
</div>
<div class="panel-body">
{% for coach in course_data.coaches %}
<div class="row">
<div class="col-xs-7 col-md-7">
<h4>{{ coach.complete_name }}</h4>
{% if coach.officer_position %}
<p>{{ coach.officer_position }}</p>
{% endif %}
{% if coach.work_or_study_place %}
<p>{{ coach.work_or_study_place }}</p>
{% endif %}
</div>
<div class="col-xs-5 col-md-5">
<div class="text-center">
<img class="img-circle" src="{{ coach.image }}" alt="{{ coach.complete_name }}">
</div>
</div>
</div>
{% endfor %}
</div>
</div>
{% endif %}
<div class="social-share">
<div class="heading"><h4>¡{{ "ShareWithYourFriends"|get_lang }}!</h4></div>
<div class="panel-body">
<div class="icons-social text-center">
<a href="#" class="btn-social">
<i class="fa fa-facebook"></i>
</a>
<a href="#" class="btn-social">
<i class="fa fa-twitter"></i>
</a>
<a href="#" class="btn-social">
<i class="fa fa-linkedin"></i>
</a>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="subscribe text-center">
<a href="#" class="btn btn-success btn-lg">{{ "Subscribe"|get_lang }}</a>
</div>
</div>
</div>
{% endfor %}
</div>
Write Preview
Loading…
Cancel
Save