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 '1.10.x' of https://github.com/chamilo/chamilo-lms into 1.10.x

Browse Source
Yannick Warnier 10 years ago
parent 6bff968d93 808120465f
commit e69bf2aca7
12 changed files with 87 additions and 80 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. 32
      app/Resources/public/css/base.css
  2. 1
      app/Resources/public/css/themes/beach/default.css
  3. 1
      app/Resources/public/css/themes/chamilo/default.css
  4. 70
      main/blog/blog.php
  5. 24
      main/exercice/exercise_submit.php
  6. 6
      main/inc/lib/banner.lib.php
  7. 2
      main/inc/lib/blog.lib.php
  8. 5
      main/inc/lib/display.lib.php
  9. 14
      main/inc/lib/template.lib.php
  10. 1
      main/survey/survey.lib.php
  11. 7
      main/template/default/layout/main_header.tpl
  12. 4
      main/template/default/skill/list.tpl

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

@ -420,6 +420,26 @@ ul#navigation .report a {
.select-list-ajax{ .select-list-ajax{
padding: 10px; padding: 10px;
} }
.resize_font{
display: inline-block;
width: 100%;
text-align: right;
}
.resize_font .btn{
padding: 5px 8px;
}
.decrease_font .fa{
font-size: 9px;
}
.reset_font .fa{
font-size: 12px;
}
.increase_font .fa{
font-size: 16px;
}
#exercise-description.panel-default{
border: 1px solid #DDD;
}
/***************************************************** /*****************************************************
* AGENDA * * AGENDA *
*****************************************************/ *****************************************************/
@ -644,7 +664,7 @@ ul#navigation .report a {
#smallcalendar .weekdays { #smallcalendar .weekdays {
background-color: #dcdcdc; background-color: #dcdcdc;
text-align: center; text-align: center;
font-size: 11px; font-size: 9px;
font-weight: bold; font-weight: bold;
border: 1px solid #fff; border: 1px solid #fff;
border-collapse: collapse; border-collapse: collapse;
@ -652,25 +672,27 @@ ul#navigation .report a {
#smallcalendar .days_week { #smallcalendar .days_week {
background-color: #f5f5f5; background-color: #f5f5f5;
text-align: center; text-align: center;
font-size: 11px; font-size: 9px;
border-collapse: collapse; border-collapse: collapse;
} }
#smallcalendar .days_weekend { #smallcalendar .days_weekend {
background-color: #e6e6e6; background-color: #e6e6e6;
text-align: center; text-align: center;
font-size: 11px; font-size: 9px;
border: 1px solid #fff; border: 1px solid #fff;
border-collapse: collapse; border-collapse: collapse;
} }
#smallcalendar .days_today { #smallcalendar .days_today {
width: 12%; width: 12%;
text-align: center; text-align: center;
font-size: 11px; font-size: 9px;
border: 1px solid #FA8500; border: 1px solid #FA8500;
border-collapse: collapse; border-collapse: collapse;
background-color: #FFCA8D; background-color: #FFCA8D;
} }
#smallcalendar tbody tr td{
padding: 5px;
}
/* --------------------------------------------------- /* ---------------------------------------------------
styles for the personal agenda styles for the personal agenda
-----------------------------------------------------*/ -----------------------------------------------------*/

1
app/Resources/public/css/themes/beach/default.css
Unescape View File

@ -81,7 +81,6 @@ a:focus {
padding: 10px 15px; padding: 10px 15px;
} }
.navbar-nav > li > a{ .navbar-nav > li > a{
font-size: 14px;
font-weight: 600; font-weight: 600;
line-height: 25px; line-height: 25px;
padding-top: 12.5px; padding-top: 12.5px;

1
app/Resources/public/css/themes/chamilo/default.css
Unescape View File

@ -79,7 +79,6 @@ a:focus {
padding: 10px 15px; padding: 10px 15px;
} }
.navbar-nav li a{ .navbar-nav li a{
font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: 22px; line-height: 22px;
padding-top: 12.5px; padding-top: 12.5px;

70
main/blog/blog.php
Unescape View File

@ -308,45 +308,43 @@ Display::display_introduction_section(TOOL_BLOGS);
?> ?>
<div class="blog-title"><h1><?php echo Blog::get_blog_title($blog_id); ?></h1></div> <div class="blog-title"><h1><?php echo Blog::get_blog_title($blog_id); ?></h1></div>
<div class="sectioncomment"><?php echo Blog::get_blog_subtitle($blog_id); ?></div> <div class="sectioncomment"><p><?php echo Blog::get_blog_subtitle($blog_id); ?></p></div>
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<?php
<div class="panel panel-default">
$month = isset($_GET['month']) ? (int)$_GET['month'] : (int) date('m'); <div class="panel-heading"><?php echo get_lang('Calendar') ?></div>
$year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y'); <div class="panel-body">
<?php
Blog::display_minimonthcalendar($month, $year, $blog_id); $month = isset($_GET['month']) ? (int)$_GET['month'] : (int) date('m');
?> $year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y');
<br /> Blog::display_minimonthcalendar($month, $year, $blog_id);
<br /> ?>
<table width="100%"> </div>
<tr> </div>
<td class="sectiontitle"><?php echo get_lang('Search') ?></td>
</tr> <div class="panel panel-default">
<tr> <div class="panel-heading"><?php echo get_lang('Search') ?></div>
<td class="blog_menu"> <div class="panel-body">
<form action="blog.php" method="get" enctype="multipart/form-data"> <form action="blog.php" method="get" enctype="multipart/form-data">
<input type="hidden" name="blog_id" value="<?php echo $blog_id ?>" /> <div class="form-group">
<input type="hidden" name="action" value="view_search_result" /> <input type="hidden" name="blog_id" value="<?php echo $blog_id ?>" />
<input type="text" size="20" name="q" value="<?php echo isset($_GET['q']) ? Security::remove_XSS($_GET['q']) : ''; ?>" /><button class="btn btn-success" type="submit"><i class="fa fa-search"></i> <?php echo get_lang('Search'); ?></button> <input type="hidden" name="action" value="view_search_result" />
</form> <input type="text" class="form-control" size="20" name="q" value="<?php echo isset($_GET['q']) ? Security::remove_XSS($_GET['q']) : ''; ?>" />
</td> </div>
</tr> <button class="btn btn-default btn-block" type="submit"><i class="fa fa-search"></i> <?php echo get_lang('Search'); ?></button>
</table> </form>
<br /> </div>
<table width="100%"> </div>
<tr>
<td class="sectiontitle"><?php echo get_lang('MyTasks') ?></td> <div class="panel panel-default">
</tr> <div class="panel-heading"><?php echo get_lang('MyTasks') ?></div>
<tr> <div class="panel-body">
<td class="blog_menu"> <?php Blog::get_personal_task_list(); ?>
<?php Blog::get_personal_task_list(); ?> </div>
</td> </div>
</tr>
</table>
</td>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<?php <?php

24
main/exercice/exercise_submit.php
Unescape View File

@ -735,28 +735,8 @@ if ($time_control) {
echo '<div style="display:none" class="warning-message" id="expired-message-id">'.get_lang('ExerciseExpiredTimeMessage').'</div>'; echo '<div style="display:none" class="warning-message" id="expired-message-id">'.get_lang('ExerciseExpiredTimeMessage').'</div>';
} }
if (!empty($objExercise->description)) { if (!empty($objExercise->description)){
echo "<script> echo Display::panelCollapse(get_lang('ExerciseDescriptionLabel'), $objExercise->description, 'exercise-description', $params['open'] = '', 'description', 'exercise-collapse');
$(function() {
$('#description_content').accordion({
changestart: function(event, ui) {
//var clicked = $(this).find('.ui-state-active').attr('id');
//$('#'+clicked).load('/widgets/'+clicked);
$('#collapse1').html(".json_encode($objExercise->description).");
}
});
});
</script>";
echo Display::generate_accordion(
array(
array(
'title' => get_lang('ExerciseDescriptionLabel'),
'content' => $objExercise->description,
),
),
'jquery',
'description_content'
);
} }
if ($origin != 'learnpath') { if ($origin != 'learnpath') {

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

@ -246,12 +246,6 @@ function return_notification_menu()
//} //}
} }
if (api_get_setting('accessibility_font_resize') == 'true') {
$html .= '<li class="resize_font">';
$html .= '<span class="decrease_font" title="'.get_lang('DecreaseFontSize').'">A</span> <span class="reset_font" title="'.get_lang('ResetFontSize').'">A</span> <span class="increase_font" title="'.get_lang('IncreaseFontSize').'">A</span>';
$html .= '</li>';
}
return $html; return $html;
} }

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

@ -2371,7 +2371,7 @@ class Blog
} }
} }
echo '<table id="smallcalendar" class="data_table">', echo '<table id="smallcalendar" class="table table-responsive">',
"<tr id=\"title\">\n", "<tr id=\"title\">\n",
"<th width=\"10%\"><a href=\"", $backwardsURL, "\">&laquo;</a></th>\n", "<th width=\"10%\"><a href=\"", $backwardsURL, "\">&laquo;</a></th>\n",
"<th align=\"center\" width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>\n", "<th align=\"center\" width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>\n",

5
main/inc/lib/display.lib.php
Unescape View File

@ -2220,7 +2220,8 @@ class Display
return "$icon "; return "$icon ";
} }
public static function panelCollapse($title, $content, $id = null, $params = null, $idAccordion = null, $idCollpase = null) public static function panelCollapse($title, $content, $id = null, $params = null, $idAccordion = null, $idCollpase = null)
{ {
$params['open'] = 'in';
if (!empty($idAccordion)) { if (!empty($idAccordion)) {
$html = null; $html = null;
$html .= '<div class="panel-group" id="'.$idAccordion.'" role="tablist" aria-multiselectable="true">' . PHP_EOL; $html .= '<div class="panel-group" id="'.$idAccordion.'" role="tablist" aria-multiselectable="true">' . PHP_EOL;
@ -2228,7 +2229,7 @@ class Display
$html .= '<div class="panel-heading" role="tab"><h4 class="panel-title">' . PHP_EOL; $html .= '<div class="panel-heading" role="tab"><h4 class="panel-title">' . PHP_EOL;
$html .= '<a role="button" data-toggle="collapse" data-parent="#'.$idAccordion.'" href="#'.$idCollpase.'" aria-expanded="true" aria-controls="'.$idCollpase.'">'.$title.'</a>' . PHP_EOL; $html .= '<a role="button" data-toggle="collapse" data-parent="#'.$idAccordion.'" href="#'.$idCollpase.'" aria-expanded="true" aria-controls="'.$idCollpase.'">'.$title.'</a>' . PHP_EOL;
$html .= '</h4></div>' . PHP_EOL; $html .= '</h4></div>' . PHP_EOL;
$html .= '<div id="'.$idCollpase.'" class="panel-collapse collapse in" role="tabpanel">' . PHP_EOL; $html .= '<div id="'.$idCollpase.'" class="panel-collapse collapse ' . $params['open'] . '" role="tabpanel">' . PHP_EOL;
$html .= '<div class="panel-body">'.$content.'</div>' . PHP_EOL; $html .= '<div class="panel-body">'.$content.'</div>' . PHP_EOL;
$html .= '</div></div></div>' . PHP_EOL; $html .= '</div></div></div>' . PHP_EOL;

14
main/inc/lib/template.lib.php
Unescape View File

@ -855,7 +855,19 @@ class Template
$notification = return_notification_menu(); $notification = return_notification_menu();
$this->assign('notification_menu', $notification); $this->assign('notification_menu', $notification);
$resize = '';
if (api_get_setting('accessibility_font_resize') == 'true') {
$resize .= '<div class="resize_font">';
$resize .= '<div class="btn-group">';
$resize .= '<a title="'.get_lang('DecreaseFontSize').'" href="#" class="decrease_font btn btn-default"><i class="fa fa-font"></i></a>';
$resize .= '<a title="'.get_lang('ResetFontSize').'" href="#" class="reset_font btn btn-default"><i class="fa fa-font"></i></a>';
$resize .= '<a title="'.get_lang('IncreaseFontSize').'" href="#" class="increase_font btn btn-default"><i class="fa fa-font"></i></a>';
$resize .= '</div>';
$resize .= '</div>';
}
$this->assign('accessibility', $resize);
// Preparing values for the menu // Preparing values for the menu
// Logout link // Logout link

1
main/survey/survey.lib.php
Unescape View File

@ -3838,6 +3838,7 @@ class SurveyUtil
WHERE iid = $insertId"; WHERE iid = $insertId";
Database::query($sql); Database::query($sql);
} }
return $insertId;
} }
return false; return false;
} }

7
main/template/default/layout/main_header.tpl
Unescape View File

@ -69,21 +69,21 @@
</div> </div>
</div> </div>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="col-4"> <div class="col-sm-4">
{% if plugin_header_left is not null %} {% if plugin_header_left is not null %}
<div id="plugin_header_left"> <div id="plugin_header_left">
{{ plugin_header_left }} {{ plugin_header_left }}
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="col-4"> <div class="col-sm-4">
{% if plugin_header_center is not null %} {% if plugin_header_center is not null %}
<div id="plugin_header_center"> <div id="plugin_header_center">
{{ plugin_header_center }} {{ plugin_header_center }}
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="col-4"> <div class="col-sm-4">
{% if plugin_header_right is not null %} {% if plugin_header_right is not null %}
<div id="plugin_header_right"> <div id="plugin_header_right">
{{ plugin_header_right }} {{ plugin_header_right }}
@ -94,6 +94,7 @@
{{ notification_menu }} {{ notification_menu }}
</ul> </ul>
</div> </div>
{{ accessibility }}
</div> </div>
</div> </div>
</div> </div>

4
main/template/default/skill/list.tpl
Unescape View File

@ -1,6 +1,6 @@
<header class="page-header"> <legend>
<h1>{{ "ManageSkills" | get_lang }}</h1> <h1>{{ "ManageSkills" | get_lang }}</h1>
</header> </legend>
<div class="table table-responsive"> <div class="table table-responsive">
<table class="table table-hover table-striped"> <table class="table table-hover table-striped">

Write Preview
Loading…
Cancel
Save