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 pull request #1064 from aragonc/1.10.x

Browse Source 
fix catalog course responsive mobile (1.10.x)
1.10.x
Yannick Warnier 9 years ago
parent 83c791d55c 4efec51add
commit 02dc89456d
5 changed files with 27 additions and 18 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. 13
      app/Resources/public/css/base.css
  2. 12
      main/document/slideshow.php
  3. 16
      main/group/settings.php
  4. 2
      main/inc/lib/groupmanager.lib.php
  5. 2
      main/template/default/auth/session_catalog.tpl

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

@ -91,7 +91,7 @@ a.thumbnail:hover{
-ms-flex-negative:1 ; -ms-flex-negative:1 ;
display: block; display: block;
position: relative; position: relative;
width: 100%;
} }
/*------------------------*/ /*------------------------*/
.cursor-pointer { .cursor-pointer {
@ -1649,7 +1649,13 @@ div.admin_section h4 {
/* Groups boxes */ /* Groups boxes */
.toolbar-groups{
margin-bottom: 30px;
}
.form-group label span{
display: block;
font-size: 12px;
}
.group_invitation_grid_container { width:100%;} .group_invitation_grid_container { width:100%;}
.group_invitation_grid_item { .group_invitation_grid_item {
border:1px dotted #CCCCCC; border:1px dotted #CCCCCC;
@ -5996,6 +6002,9 @@ a.sessionView {
.col-xs-6{ .col-xs-6{
width: 100%; width: 100%;
} }
.gallery .canvas-two{
width: 100%;
}
} }
.elfinder-cwd-filename { .elfinder-cwd-filename {

12
main/document/slideshow.php
Unescape View File

@ -170,10 +170,10 @@ if ($slide_id == 'all') {
// Config for make thumbnails // Config for make thumbnails
$allowed_thumbnail_types = array('jpg', 'jpeg', 'gif', 'png'); $allowed_thumbnail_types = array('jpg', 'jpeg', 'gif', 'png');
$max_thumbnail_width = 200; $max_thumbnail_width = 250;
$max_thumbnail_height = 200; $max_thumbnail_height = 250;
$png_compression = 0;//0(none)-9 $png_compression = 0;//0(none)-9
$jpg_quality = 75;//from 0 to 100 (default is 75). More quality less compression $jpg_quality = 100;//from 0 to 100 (default is 75). More quality less compression
$directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/'; $directory_thumbnails = $sys_course_path.$_course['path'].'/document'.$folder.'.thumbs/';
@ -228,8 +228,7 @@ if ($slide_id == 'all') {
$max_thumbnail_width, $max_thumbnail_width,
$max_thumbnail_height $max_thumbnail_height
); );
if($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
if ($max_thumbnail_width>$original_image_size['width'] && $max_thumbnail_height>$original_image_size['height']){
$new_thumbnail_size['width']=$original_image_size['width']; $new_thumbnail_size['width']=$original_image_size['width'];
$new_thumbnail_size['height']=$original_image_size['height']; $new_thumbnail_size['height']=$original_image_size['height'];
} }
@ -327,11 +326,12 @@ if ($slide_id == 'all') {
$count_image = count($image_tag); $count_image = count($image_tag);
$number_iteration = ceil($count_image/$number_image); $number_iteration = ceil($count_image/$number_image);
$p = 0; $p = 0;
$html = '';
$html .= '<div class="gallery">'; $html .= '<div class="gallery">';
for ($k = 0; $k < $number_iteration; $k++) { for ($k = 0; $k < $number_iteration; $k++) {
for ($i = 0; $i < $number_image; $i++) { for ($i = 0; $i < $number_image; $i++) {
if (isset($image_tag[$p])) { if (isset($image_tag[$p])) {
$html .= '<div class="col-md-3">'; $html .= '<div class="col-xs-6 col-sm-3 col-md-2">';
$html .= '<div class="canvas-one">'; $html .= '<div class="canvas-one">';
$html .= '<a class="canvas-two" href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">'; $html .= '<a class="canvas-two" href="slideshow.php?slide_id='.$p.'&curdirpath='.$pathurl.'">';
$html .= '<div class="frame">'; $html .= '<div class="frame">';

16
main/group/settings.php
Unescape View File

@ -78,7 +78,7 @@ $group = array(
$form->createElement('checkbox', 'self_registration_allowed', get_lang('GroupSelfRegistration'), get_lang('GroupAllowStudentRegistration'), 1), $form->createElement('checkbox', 'self_registration_allowed', get_lang('GroupSelfRegistration'), get_lang('GroupAllowStudentRegistration'), 1),
$form->createElement('checkbox', 'self_unregistration_allowed', null, get_lang('GroupAllowStudentUnregistration'), 1) $form->createElement('checkbox', 'self_unregistration_allowed', null, get_lang('GroupAllowStudentUnregistration'), 1)
); );
$form->addGroup($group, '', Display::return_icon('user.png', get_lang('GroupSelfRegistration'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupSelfRegistration'), '', false); $form->addGroup($group, '', Display::return_icon('user.png', get_lang('GroupSelfRegistration'), array(), ICON_SIZE_SMALL).'<span>'.get_lang('GroupSelfRegistration').'</span>', '', false);
// Documents settings // Documents settings
$group = array( $group = array(
@ -86,7 +86,7 @@ $group = array(
$form->createElement('radio', 'doc_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC), $form->createElement('radio', 'doc_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC),
$form->createElement('radio', 'doc_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE) $form->createElement('radio', 'doc_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE)
); );
$form->addGroup($group, '', Display::return_icon('folder.png', get_lang('GroupDocument'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupDocument'), '', false); $form->addGroup($group, '', Display::return_icon('folder.png', get_lang('GroupDocument'), array(), ICON_SIZE_SMALL).'<span>'.get_lang('GroupDocument').'</span>', '', false);
// Work settings // Work settings
$group = array( $group = array(
@ -94,7 +94,7 @@ $group = array(
$form->createElement('radio', 'work_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC), $form->createElement('radio', 'work_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC),
$form->createElement('radio', 'work_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE) $form->createElement('radio', 'work_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE)
); );
$form->addGroup($group, '', Display::return_icon('work.png', get_lang('GroupWork'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupWork'), '', false); $form->addGroup($group, '', Display::return_icon('works.png', get_lang('GroupWork'), array(), ICON_SIZE_SMALL).'<span>'.get_lang('GroupWork').'</span>', '', false);
// Calendar settings // Calendar settings
$group = array( $group = array(
@ -102,7 +102,7 @@ $group = array(
$form->createElement('radio', 'calendar_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC), $form->createElement('radio', 'calendar_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC),
$form->createElement('radio', 'calendar_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE) $form->createElement('radio', 'calendar_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE)
); );
$form->addGroup($group, '', Display::return_icon('agenda.png', get_lang('GroupCalendar'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupCalendar'), '', false); $form->addGroup($group, '', Display::return_icon('agenda.png', get_lang('GroupCalendar'), array(), ICON_SIZE_SMALL).'<span>'.get_lang('GroupCalendar').'</span>', '', false);
$form->addElement('html', '</div>'); $form->addElement('html', '</div>');
$form->addElement('html', '<div class="col-md-6">'); $form->addElement('html', '<div class="col-md-6">');
@ -113,7 +113,7 @@ $group = array(
$form->createElement('radio', 'announcements_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC), $form->createElement('radio', 'announcements_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC),
$form->createElement('radio', 'announcements_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE) $form->createElement('radio', 'announcements_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE)
); );
$form->addGroup($group, '', Display::return_icon('announce.png', get_lang('GroupAnnouncements'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupAnnouncements'), '', false); $form->addGroup($group, '', Display::return_icon('announce.png', get_lang('GroupAnnouncements'), array(), ICON_SIZE_SMALL).'<span>'.get_lang('GroupAnnouncements').'</span>', '', false);
// Forum settings // Forum settings
$group = array( $group = array(
@ -121,7 +121,7 @@ $group = array(
$form->createElement('radio', 'forum_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC), $form->createElement('radio', 'forum_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC),
$form->createElement('radio', 'forum_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE) $form->createElement('radio', 'forum_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE)
); );
$form->addGroup($group, '', Display::return_icon('forum.png', get_lang('GroupForum'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupForum'), '', false); $form->addGroup($group, '', Display::return_icon('forum.png', get_lang('GroupForum'), array(), ICON_SIZE_SMALL).'<span>'.get_lang('GroupForum').'</span>', '', false);
// Wiki settings // Wiki settings
$group = array( $group = array(
@ -129,7 +129,7 @@ $group = array(
$form->createElement('radio', 'wiki_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC), $form->createElement('radio', 'wiki_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC),
$form->createElement('radio', 'wiki_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE) $form->createElement('radio', 'wiki_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE)
); );
$form->addGroup($group, '', Display::return_icon('wiki.png', get_lang('GroupWiki'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupWiki'), '', false); $form->addGroup($group, '', Display::return_icon('wiki.png', get_lang('GroupWiki'), array(), ICON_SIZE_SMALL).'<span>'.get_lang('GroupWiki').'</span>', '', false);
// Chat settings // Chat settings
$group = array( $group = array(
@ -137,7 +137,7 @@ $group = array(
$form->createElement('radio', 'chat_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC), $form->createElement('radio', 'chat_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC),
$form->createElement('radio', 'chat_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE) $form->createElement('radio', 'chat_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE)
); );
$form->addGroup($group, '', Display::return_icon('chat.png', get_lang('Chat'), array(), ICON_SIZE_SMALL).' '.get_lang('Chat'), '', false); $form->addGroup($group, '', Display::return_icon('chat.png', get_lang('Chat'), array(), ICON_SIZE_SMALL).'<span>'.get_lang('Chat').'</span>', '', false);
$form->addElement('html', '</div>'); $form->addElement('html', '</div>');
$form->addElement('html', '<div class="col-md-12">'); $form->addElement('html', '<div class="col-md-12">');

2
main/inc/lib/groupmanager.lib.php
Unescape View File

@ -2717,7 +2717,7 @@ class GroupManager
$url = api_get_path(WEB_CODE_PATH).'group/%s?'.api_get_cidreq(); $url = api_get_path(WEB_CODE_PATH).'group/%s?'.api_get_cidreq();
echo ' echo '
<ul class="nav nav-tabs"> <ul class="toolbar-groups nav nav-tabs">
<li class="'.$activeSettings.'"> <li class="'.$activeSettings.'">
<a href="'.sprintf($url, 'settings.php').'"> <a href="'.sprintf($url, 'settings.php').'">
'.Display::return_icon('settings.png').' '.get_lang('Settings').' '.Display::return_icon('settings.png').' '.get_lang('Settings').'

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

@ -78,7 +78,7 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="row"> <div class="row">
{% for session in sessions %} {% for session in sessions %}
<div class="col-md-3 session-col"> <div class="col-xs-6 col-sm-6 col-md-3 session-col">
<div class="item" id="session-{{ session.id }}"> <div class="item" id="session-{{ session.id }}">
<img src="{{ session.image ? _p.web_upload ~ session.image : _p.web_img ~ 'session_default.png' }}"> <img src="{{ session.image ? _p.web_upload ~ session.image : _p.web_img ~ 'session_default.png' }}">

Write Preview
Loading…
Cancel
Save