add tabs courrent courses and completed course BT#9885 #TMI

Conflicts:
	app/Resources/public/css/themes/games/default.css
aragonc 11 years ago committed by Angel Fernando Quiroz Campos
parent 292c5aaef9
commit 9f78b773d8
  1. 68
      app/Resources/public/css/themes/games/default.css
  2. 129
      main/template/games/user_portal/session.tpl
  3. 13
      main/template/games/user_portal/tabs.tpl
  4. 12
      user_portal.php

@ -441,6 +441,74 @@ footer .media{
background-color: #D81E49;
color: #ffffff;
}
#current-courses .title-course{
color: #E73858;
font-size: 24px;
padding-top: 20px;
padding-bottom: 20px;
margin-top: 30px;
}
#current-courses .title-course a{
color: #E73858;
}
#current-courses .title-course .fa-square{
font-size: 16px;
}
#current-courses .current-item{
background-color: #f4f4f4;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
padding: 20px;
margin-bottom: 20px;
}
#current-courses .description-course{
padding-top: 10px;
padding-bottom: 10px;
color: #555555;
}
#current-courses .teachers-course{
padding-top: 10px;
padding-bottom: 10px;
}
#current-courses .teachers-course .fa-pencil-square{
color: #35a8c8;
font-size: 24px;
}
#current-courses .teachers-course span{
color: #555555;
}
#current-courses .teachers-course span .fa-square{
color: #e1e1e1;
font-size: 12px;
margin-left: 10px;
}
#current-courses .time-course{
padding-bottom: 5px;
padding-top: 5px;
color: #555555;
}
#current-courses .time-course .fa-clock-o{
font-size: 24px;
color: #35a8c8;
margin-right: 10px;
}
#current-courses .btn{
float: right;
}
.btn-press{
background-color: #e73858;
color: #fff;
text-transform: uppercase;
border:1px solid #e73858;
border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
}
.btn-press:hover{
background-color: #cf3652;
color: #fff;
}
/* Large desktop */
@media (min-width: 1200px) {
.container{

@ -1,92 +1,67 @@
<div class="panel panel-default">
{% if not session.show_simple_session_info %}
<div class="panel-heading">
{% if session.show_link_to_session %}
<a href="{{ _p.web_main ~ 'session/index.php?session_id=' ~ session.id }}">
<img id="session_img_{{ session.id }}" src="{{ "window_list.png"|icon(32) }}" alt="{{ session.title }}" title="{{ session.title }}">
{{ session.title }}
</a>
{% else %}
<img id="session_img_{{ session.id }}" src="{{ "window_list.png"|icon(32) }}" alt="{{ session.title }}" title="{{ session.title }}">
{{ session.title }}
{% endif %}
{% if session.show_actions %}
<!-- Courrent Courses -->
{% if not session.show_simple_session_info %}
<div class="title-course">
{% if session.show_link_to_session %}
<i class="fa fa-square"></i>
<a href="{{ _p.web_main ~ 'session/index.php?session_id=' ~ session.id }}" alt="{{ session.title }}" title="{{ session.title }}">
{{ session.title }}
</a>
{% else %}
<i class="fa fa-square"></i>
{{ session.title }}
{% endif %}
{% if session.show_actions %}
<div class="pull-right">
<a href="{{ _p.web_main ~ "session/resume_session.php?id_session=" ~ session.id }}">
<img src="{{ "edit.png"|icon(22) }}" alt="{{ "Edit"|get_lang }}" title="{{ "Edit"|get_lang }}">
</a>
</div>
{% endif %}
</div>
{% endif %}
</div>
{% endif %}
<div class="sessions panel-body">
{% if session.show_simple_session_info %}
<div class="row">
<div class="col-md-7">
<h3>
{{ session.title ~ session.notifications }}
</h3>
<div class="current-item">
{% if session.show_simple_session_info %}
{% if session.show_description %}
<div>
{% else %}
<div class="row">
<div class="col-md-4">Imagen</div>
<div class="col-md-8">
{% if session.show_description %}
<div class="description-course">
{{ session.description }}
</div>
{% endif %}
{% if session.subtitle %}
<small>{{ session.subtitle }}</small>
{% endif %}
{% if session.teachers %}
<h5>{{ "teacher.png"|icon(16) ~ session.teachers }}</h5>
{% endif %}
{% if session.coaches %}
<h5>{{ "teacher.png"|icon(16) ~ session.coaches }}</h5>
{% endif %}
</div>
{% if session.show_actions %}
<div class="col-md-5 text-right">
<a href="{{ _p.web_main ~ "session/resume_session.php?id_session=" ~ session.id }}">
<img src="{{ "edit.png"|icon(22) }}" alt="{{ "Edit"|get_lang }}" title="{{ "Edit"|get_lang }}">
</a>
</div>
{% endif %}
</div>
{% else %}
<div class="row">
<div class="col-md-12">
{% if session.subtitle %}
<p class="subtitle-session">
<i class="fa fa-clock-o"></i> <em>{{ session.subtitle }}</em>
</p>
{% endif %}
{% if session.show_description %}
<div class="description-session">
{{ session.description }}
{% endif %}
<div class="teachers-course">
<i class="fa fa-pencil-square"></i>
<span><i class="fa fa-square"></i> Ronald Avila</span>
<span><i class="fa fa-square"></i> Luis Rosales</span>
<span><i class="fa fa-square"></i> Daniel Falcón</span>
<span><i class="fa fa-square"></i> Martín Farfan</span>
</div>
{% if session.subtitle %}
<div class="time-course">
<i class="fa fa-clock-o"></i>
<span class="text-uppercase"> {{ session.subtitle }} </span>
</div>
{% endif %}
<div class="sessions-items">
{% for item in session.courses %}
<div class="row">
<div class="col-md-2">
{% if item.link %}
<a href="{{ item.link }}" class="thumbnail">{{ item.icon }}</a>
{% else %}
{{ item.icon }}
{% endif %}
</div>
<div class="col-md-10">
{{ item.title }}
{{ item.coaches }}
</div>
{% endif %}
<div class="row">
<div class="col-md-6"></div>
<div class="col-md-6">
<a class="btn btn-press" href="{{ _p.web_main ~ 'session/index.php?session_id=' ~ session.id }}" role="button">Continuar</a>
</div>
{% endfor %}
</div>
</div>
</div>
{% endif %}
</div>
{% endif %}
</div>
</div>
<!-- End courrent Courses -->

@ -0,0 +1,13 @@
<div class="block-course">
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#current-courses" aria-controls="current-courses" role="tab" data-toggle="tab">Cursos Actuales</a></li>
<li role="presentation"><a href="#completed-courses" aria-controls="completed-courses" role="tab" data-toggle="tab">Cursos Concluidos</a></li>
</ul>
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="current-courses">
{{ tabs_course }}
</div>
<div role="tabpanel" class="tab-pane" id="completed-courses">...2</div>
</div>
</div>

@ -137,7 +137,17 @@ if (empty($courseAndSessions['html']) && !isset($_GET['history'])) {
$controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
}
$controller->tpl->assign('content', $courseAndSessions['html']);
if($_configuration['default_template'] == 'games'){
$tpl = new Template(get_lang('CurrentCourses'));
$tpl->assign('tabs_course', $courseAndSessions['html']);
$layout .= $tpl->get_template('user_portal/tabs.tpl');
$controller->tpl->assign('content', $tpl->fetch($layout));
}
else{
$controller->tpl->assign('content', $courseAndSessions['html']);
}
if (api_get_setting('allow_browser_sniffer') == 'true') {
if ($_SESSION['sniff_navigator'] != "checked") {

Loading…
Cancel
Save