add img icons windows_list update

Conflicts:
	main/img/icons/32/window_list.png
	main/img/icons/48/window_list.png
	main/img/window_list.png
	main/template/default/auth/sessions_catalog.tpl
1.9.x
aragonc 10 years ago committed by Angel Fernando Quiroz Campos
parent 7e5894951c
commit 2e008a364f
  1. 4
      main/auth/courses_controller.php
  2. 22
      main/css/base.css
  3. BIN
      main/img/check.png
  4. BIN
      main/img/icons/128/window_list.png
  5. BIN
      main/img/icons/16/window_list.png
  6. BIN
      main/img/icons/22/window_list.png
  7. BIN
      main/img/icons/64/window_list.png
  8. 66
      main/template/default/auth/sessions_catalog.tpl

@ -455,7 +455,7 @@ class CoursesController
$url = api_get_path(WEB_PATH) . "main/inc/email_editor.php?action=subscribe_me_to_session&session=$sessionName";
return Display::url(get_lang('Subscribe'), $url, array(
'class' => 'btn btn-success',
'class' => 'btn btn-large btn-primary',
));
}
@ -477,7 +477,7 @@ class CoursesController
*/
public function getSessionIcon($sessionName)
{
return Display::return_icon('window_list.png', $sessionName, null, ICON_SIZE_LARGE);
return Display::return_icon('window_list.png', $sessionName, null, ICON_SIZE_BIG);
}
}

@ -165,10 +165,10 @@ header #logo img{
padding-top: 5px;
padding-bottom: 10px;
}
.session-group .thumbnail{
/*.session-group .thumbnail{
border: none;
box-shadow: none;
}
}*/
.session-group .border-info{
/*border-bottom: 1px solid #ccc;*/
padding-bottom: 5px;
@ -180,9 +180,27 @@ header #logo img{
.session-group .time{
font-size: 12px;
}
.session-group .accordion-heading{
background-color: #D2E7F3;
}
.session-group .accordion-group{
border: 1px solid #B7D7EF;
}
.session-group .accordion-inner{
border-top: 1px solid #B7D7EF;
background-color: #FFFFFF;
}
.buttom-subscribed .btn{
display: block;
}
.session-group .items-session{
list-style: none;
padding: 0;
margin: 0;
}
.session-group .items-session li{
padding-bottom: 5px;
}
/* SESSION CATALOG END*/
.subnav .brand {

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 997 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

@ -11,34 +11,34 @@
var $target = $(e.target);
var $targetContent = $target.find('.accordion-inner');
$targetContent.empty();
var idParts = $target.attr('id').split('-');
var sessionId = parseInt(idParts[1], 10);
$.ajax('{{ web_session_courses_ajax_url }}', {
data: {
a: 'display_sessions_courses',
session: sessionId
},
dataType: 'json',
success: function(response) {
var coursesUL = '';
$.each(response, function(index, course) {
coursesUL += '<li><strong>' + course.name + '</strong>';
if (course.coachName != '') {
coursesUL += ' (' + course.coachName + ')';
}
coursesUL += '</li>';
});
$targetContent.html('<ul>' + coursesUL + '</ul>');
}
});
if ($targetContent.is(':empty')) {
var idParts = $target.attr('id').split('-');
var sessionId = parseInt(idParts[1], 10);
$.ajax('{{ web_session_courses_ajax_url }}', {
data: {
a: 'display_sessions_courses',
session: sessionId
},
dataType: 'json',
success: function(response) {
var coursesUL = '';
$.each(response, function(index, course) {
coursesUL += '<li><img src="{{ _p.web }}/main/img/check.png"/> <strong>' + course.name + '</strong>';
if (course.coachName != '') {
coursesUL += ' (' + course.coachName + ')';
}
coursesUL += '</li>';
});
$targetContent.html('<ul class="items-session">' + coursesUL + '</ul>');
}
});
}
});
});
</script>
@ -98,11 +98,7 @@
{% endif %}
</div>
<div class="span9">
<div class="page-header">
<h3>{{ nameTools }}</h3>
</div>
{% for session in sessions_blocks %}
{% for session in sessions_blocks %}
<div class="well well-small session-group" id="session-{{ session.id }}">
<div class="row-fluid">
<div class="span9">
@ -114,7 +110,7 @@
</div>
<div class="span10 border-info">
<h3>{{ session.name }}</h3>
<div class="tutor">General tutor: <img src="{{ _p.web }}/main/img/teachers.gif" width="16px"> {{ session.coach_name }}</div>
<div class="tutor"><img src="{{ _p.web }}/main/img/teachers.gif" width="16px"> {{ 'GeneralCoach' | get_lang }} {{ session.coach_name }}</div>
</div>
</div>
<div class="row-fluid">
@ -141,7 +137,7 @@
{{ session.subscribe_button }}
{% endif %}
</div>
<div class="time">{{ session.date }}</div>
<div class="time"><img src="{{ _p.web }}/main/img/agenda.gif"> {{ session.date }}</div>
</div>
</div>
</div>

Loading…
Cancel
Save