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

update progress bar

Browse Source
1.10.x
aragonc 11 years ago
parent 2a28d75eae
commit 82a46d5b62
4 changed files with 93 additions and 112 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. 14
      composer.lock
  2. 167
      main/css/base.css
  3. 4
      main/newscorm/learnpath.class.php
  4. 20
      main/newscorm/lp_view.php

14
composer.lock generated
Unescape View File

@ -485,16 +485,16 @@
},
{
"name": "bower-asset/jquery-ui",
"version": "1.11.3",
"version": "1.11.4",
"source": {
"type": "git",
"url": "https://github.com/components/jqueryui.git",
"reference": "7e2d6bec1c729925d9ad7c0c9ab4b561174efa99"
"reference": "c34f8dbf3ba57b3784b93f26119f436c0e8288e1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/components/jqueryui/zipball/7e2d6bec1c729925d9ad7c0c9ab4b561174efa99",
"reference": "7e2d6bec1c729925d9ad7c0c9ab4b561174efa99",
"url": "https://api.github.com/repos/components/jqueryui/zipball/c34f8dbf3ba57b3784b93f26119f436c0e8288e1",
"reference": "c34f8dbf3ba57b3784b93f26119f436c0e8288e1",
"shasum": ""
},
"require": {
@ -1781,7 +1781,7 @@
"email": "stof@notk.org"
},
{
"name": "KnpLabs",
"name": "Knplabs",
"homepage": "http://knplabs.com"
},
{
@ -1924,12 +1924,12 @@
"version": "v5.7.4",
"source": {
"type": "git",
"url": "https://github.com/mpdf/mpdf.git",
"url": "https://github.com/finwe/mpdf.git",
"reference": "f9a374c7ea975ce8c795cec4dfd17ef55addac9c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mpdf/mpdf/zipball/f9a374c7ea975ce8c795cec4dfd17ef55addac9c",
"url": "https://api.github.com/repos/finwe/mpdf/zipball/f9a374c7ea975ce8c795cec4dfd17ef55addac9c",
"reference": "f9a374c7ea975ce8c795cec4dfd17ef55addac9c",
"shasum": ""
},

167
main/css/base.css
Unescape View File

@ -3321,21 +3321,7 @@ form .formw .freeze {
margin-bottom: .5em;
text-align: center;
}
#author_image {
border: 2px solid #B9C9FF;
float: left;
margin-bottom: .5em;
padding: 8px;
position: relative;
background-color: #f0f1fa;
width: 94%;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
border-radius: 10px;
}
#author_image #author_icon{
border: 2px solid #FFFFFF;
}
#learning_path_left_zone .scorm_title{
font-size: 20px;
color: #666;
@ -4300,81 +4286,6 @@ a.forum_group_link {
padding-top:8px;
}
/* Default LP left column values */
#learning_path_left_zone {
float:left;
width:315px;
height:100%;
padding-left: 8px;
padding-right: 4px;
}
#learning_path_left_zone #header {
font-size:14px;
}
#author_icon {
float:left;
}
#lp_navigation_elem {
float:left;
}
#author_image {
border: 1px solid #CCCCCC;
float: left;
margin: 0;
padding: 8px;
position: relative;
width: 94%;
}
#author_name {
float: left;
text-align:center;
width: 100%;
font-size: 11px;
color: #888;
margin-top: 2px;
}
#lp_media_file {
float: left;
text-align:center;
width: 94%;
}
#learning_path_toc {
font-size:9pt;
margin:0;
}
.ui-state-highlight_lp {
border: 1px solid #FEAA18;
background: #FFB738;
color: #363636;
height:20px;
width: 70%;
}
.bottom_actions {
display: block;
}
.bottom_actions_fixed {
position: fixed;
z-index: 9001;
bottom: 0;
left: 0px;
margin-bottom: 0px;
background:#ECF0F1;
padding: 20px;
border-top: 3px solid #DCE4EC;
}
.doc_folder {
margin-right:5px;
@ -5421,3 +5332,79 @@ i.size-32.icon-new-work{
vertical-align: bottom;
margin-right: 5px;
}
/* LP SCORM */
/* Default LP left column values */
#learning_path_left_zone {
float:left;
width:315px;
height:100%;
padding-left: 8px;
padding-right: 4px;
}
#learning_path_left_zone #header {
font-size:14px;
}
#author_icon {
float:left;
}
#lp_navigation_elem {
float:left;
}
#author_image {
border: 1px solid #CCCCCC;
float: left;
margin: 0;
padding: 8px;
position: relative;
width: 100%;
}
#author_name {
float: left;
text-align:center;
width: 100%;
font-size: 11px;
color: #888;
margin-top: 2px;
}
#lp_media_file {
float: left;
text-align:center;
width: 94%;
}
#learning_path_toc {
font-size:9pt;
margin:0;
}
.ui-state-highlight_lp {
border: 1px solid #FEAA18;
background: #FFB738;
color: #363636;
height:20px;
width: 70%;
}
.bottom_actions {
display: block;
}
.bottom_actions_fixed {
position: fixed;
z-index: 9001;
bottom: 0;
left: 0px;
margin-bottom: 0px;
background:#ECF0F1;
padding: 20px;
border-top: 3px solid #DCE4EC;
}

4
main/newscorm/learnpath.class.php
Unescape View File

@ -2432,7 +2432,9 @@ class learnpath
{
$text = $percentage . $text_add;
$output = '<div class="progress">
<div id="progress_bar_value" class="bar" style="width: '.$text.';"><span id="progress_text">'. $text .'</span></div>
<div id="progress_bar_value" class="progress-bar" role="progressbar" aria-valuenow="' .$percentage. '" aria-valuemin="0" aria-valuemax="100" style="width: '.$text.';">
'. $text .'
</div>
</div>';
return $output;

20
main/newscorm/lp_view.php
Unescape View File

@ -359,10 +359,7 @@ if ($is_allowed_to_edit) {
echo '</div>';
echo '</div>';
}
echo '<div class="row">';
//echo '<div id="learning_path_left_zone" style="'.$display_none.'"> ';
echo '<div class="col-md-2">';
echo '<div id="learning_path_left_zone">';
echo '<div id="learning_path_left_zone" style="'.$display_none.'"> ';
echo '<div class="buttom-home">';
//echo '<a href="lp_controller.php?action=return_to_course_homepage&'.api_get_cidreq().'" target="_self" onclick="javascript: window.parent.API.save_asset();"></a>';
@ -444,12 +441,9 @@ if ($is_allowed_to_edit) {
<!-- end TOC layout -->
</div>
<!-- end left zone -->
</div>
<div class="col-md-10">
<!-- right zone -->
<!-- right zone -->
<div id="learning_path_right_zone" style="margin-left:<?php echo $margin_left;?>;height:100%">
<?php
// hub 26-05-2010 Fullscreen or not fullscreen
$height = '100%';
@ -461,8 +455,6 @@ if ($is_allowed_to_edit) {
?>
</div>
<!-- end right Zone -->
</div>
</div> <!--- End row -->
</div>
<script>
@ -503,8 +495,8 @@ if ($is_allowed_to_edit) {
}, "top.content_name",
{ load: [
{ type:"script", id:"_fr1", src:"<?php echo api_get_jquery_web_path(); ?>"},
{ type:"script", id:"_fr4", src:"<?php echo api_get_jquery_ui_js_web_path(); ?>"},
{ type:"stylesheet", id:"_fr5", src:"<?php echo api_get_jquery_ui_css_web_path(); ?>"},
{ type:"script", id:"_fr4", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.min.js"},
{ type:"stylesheet", id:"_fr5", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.css"},
{ type:"script", id:"_fr2", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"}
] }
);
@ -516,8 +508,8 @@ if ($is_allowed_to_edit) {
{
load: [
{ type:"script", id:"_fr1", src:"<?php echo api_get_jquery_web_path(); ?>"},
{ type:"script", id:"_fr4", src:"<?php echo api_get_jquery_ui_js_web_path(); ?>"},
{ type:"stylesheet", id:"_fr5", src:"<?php echo api_get_jquery_ui_css_web_path(); ?>"},
{ type:"script", id:"_fr4", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.min.js"},
{ type:"stylesheet", id:"_fr5", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery-ui/smoothness/jquery-ui-1.8.21.custom.css"},
{ type:"script", id:"_fr2", src:"<?php echo api_get_path(WEB_LIBRARY_PATH); ?>javascript/jquery.highlight.js"}
]}
);

Write Preview
Loading…
Cancel
Save