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

fix errors desing CT#7539

Browse Source
1.10.x
aragonc 10 years ago
parent 653a5ff3f7
commit 3f379d108c
8 changed files with 42 additions and 36 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. 20
      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. 24
      main/exercice/exercise_submit.php
  5. 6
      main/inc/lib/banner.lib.php
  6. 5
      main/inc/lib/display.lib.php
  7. 14
      main/inc/lib/template.lib.php
  8. 7
      main/template/default/layout/main_header.tpl

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

@ -420,6 +420,26 @@ ul#navigation .report a {
.select-list-ajax{
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 *
*****************************************************/

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

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

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>';
}
if (!empty($objExercise->description)) {
echo "<script>
$(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 (!empty($objExercise->description)){
echo Display::panelCollapse(get_lang('ExerciseDescriptionLabel'), $objExercise->description, 'exercise-description', $params['open'] = '', 'description', 'exercise-collapse');
}
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;
}

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

@ -2220,7 +2220,8 @@ class Display
return "$icon ";
}
public static function panelCollapse($title, $content, $id = null, $params = null, $idAccordion = null, $idCollpase = null)
{
{
$params['open'] = 'in';
if (!empty($idAccordion)) {
$html = null;
$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 .= '<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 .= '<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></div></div>' . PHP_EOL;

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

@ -855,7 +855,19 @@ class Template
$notification = return_notification_menu();
$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
// Logout link

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

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

Write Preview
Loading…
Cancel
Save