diff --git a/composer.lock b/composer.lock index 0b65998d26..2fe25c899b 100755 --- a/composer.lock +++ b/composer.lock @@ -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": "" }, diff --git a/main/css/base.css b/main/css/base.css index 38236aa925..ecb69bea08 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -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; +} diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php index 5d8b2eaa71..1febd08759 100755 --- a/main/newscorm/learnpath.class.php +++ b/main/newscorm/learnpath.class.php @@ -2432,7 +2432,9 @@ class learnpath { $text = $percentage . $text_add; $output = '
-
'. $text .'
+
+ '. $text .' +
'; return $output; diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php index b79a6de16d..85294b7fd6 100755 --- a/main/newscorm/lp_view.php +++ b/main/newscorm/lp_view.php @@ -359,10 +359,7 @@ if ($is_allowed_to_edit) { echo ''; echo ''; } - echo '
'; - //echo '
'; - echo '
'; - echo '
'; + echo '
'; echo '
'; //echo ''; @@ -444,12 +441,9 @@ if ($is_allowed_to_edit) {
-
-
- +
-
-
-