diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 30e4c4aa52..0cc0fba0a6 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -1288,21 +1288,18 @@ a.unread { float:left; width:100%; } - .lp_resource_element, .lp_resource_element_no_link { - background-image:-moz-linear-gradient(top,#fefefe,#eee); - background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fdfdfd),color-stop(1,#eee)); - border: 1px solid #CCCCCC; + border: 1px solid #DDDDDD; color: #444444; cursor: pointer; - font-weight: bold; text-decoration: none; - text-shadow: 0 1px 1px #F6F6F6; margin:5px; - padding:5px; - list-style: none outside none; + padding:5px 10px; + list-style: none; border-radius: 5px; - width:80% !important; +} +.lp_resource_element:hover{ + background-color: #E6E6E6; } .lp_resource_element_new a { font-size: 14px; @@ -1508,15 +1505,15 @@ div.admin_section h4 { } #lp_item_list ul, #lp_item_list li{ - /* float:left;*/ width:100%; } - #lp_item_list .item_data { - padding:5px 0px 5px 0px; + padding:0; /* float:left;*/ } - +#lp_item_list .item_data span{ + margin-left: 5px; +} .item_data .button_actions { display: none; margin: 5px 0px; @@ -5688,9 +5685,6 @@ a.sessionView { margin-top: 20px; } #resource_tab li a { - padding: 5px 10px; -} -#resource_tab li.lp_resource_element a{ padding: 5px; } /* Gravatar */ diff --git a/app/Resources/public/css/scorm.css b/app/Resources/public/css/scorm.css index 9d4950c504..d0340593ea 100644 --- a/app/Resources/public/css/scorm.css +++ b/app/Resources/public/css/scorm.css @@ -18,7 +18,6 @@ See https://support.chamilo.org/issues/6976 position: relative; width: 100%; } - #author_name { float: left; text-align:center; @@ -27,11 +26,6 @@ See https://support.chamilo.org/issues/6976 color: #888; margin-top: 2px; } - -#learning_path_toc { - font-size:9pt; - margin:0; -} #learning_path_left_zone #scorm-gamification{ } #scorm-gamification .fa-star{ @@ -81,13 +75,6 @@ See https://support.chamilo.org/issues/6976 text-decoration: none; font-weight: bold; } -.inner_lp_toc .scorm_item_section { - background:#E8ECEF; - color:#666; - padding: 5px 0px 5px 0px; - font-size: 12px; - font-weight: bold; -} .inner_lp_toc .scorm_item { font-size: 16px; margin-left: 10px; @@ -102,40 +89,50 @@ See https://support.chamilo.org/issues/6976 } /* learning path's classes for section and item for 5 levels of depth */ .scorm_section_level_0 { - padding : 0 0 0 0; + margin: 0 0 0 0; } .scorm_section_level_1 { - padding : 0 0.5em 0 2em; + margin: 0 0.5em 0 20px; } .scorm_section_level_2 { - padding : 0 0.5em 0 4em; + margin: 0 0.5em 0 40px; } .scorm_section_level_3 { - padding : 0 0.5em 0 6em; + margin: 0 0.5em 0 60px; } .scorm_section_level_4 { - padding : 0 0.5em 0 8em; + margin: 0 0.5em 0 70px; } .scorm_section_level_5 { - padding : 0 0.5em 0 10em; + margin: 0 0.5em 0 10em; } -.scorm_item_level_0 { - padding : 0 0 0 0; +.scorm_item_normal{ + line-height: 25px; + border-bottom: 1px solid #DDD; +} +.level_0 { + margin: 0; + padding-left: 20px; } -.scorm_item_level_1 { - padding : 0 0.5em 0 1.5em; +.level_1 { + margin: 0 0.5em 0 20px; + padding-left: 20px; } -.scorm_item_level_2 { - padding : 0 0.5em 0 3em; +.level_2 { + margin: 0 0.5em 0 40px; + padding-left: 20px; } -.scorm_item_level_3 { - padding : 0 0.5em 0 4.5em; +.level_3 { + margin: 0 0.5em 0 60px; + padding-left: 20px; } -.scorm_item_level_4 { - padding : 0 0.5em 0 6em; +.level_4 { + margin: 0 0.5em 0 70px; + padding-left: 20px; } -.scorm_item_level_5 { - padding : 0 0.5em 0 7.5em; +.level_5 { + margin: 0 0.5em 0 90px; + padding-left: 20px; } #learning_path_breadcrumb_zone .breadcrumb{ background-color: #2b3d53; @@ -191,10 +188,6 @@ See https://support.chamilo.org/issues/6976 margin-top: .5em; font-size: 12px; } -#lp_navigation_elem .buttons { - -} - #learning_path_left_zone .scorm_title{ font-size: 20px; color: #666; @@ -202,80 +195,59 @@ See https://support.chamilo.org/issues/6976 margin-top: .5em; } /* for section */ -.scorm_item_section.scorm_completed{ - color: #ffffff; - padding-right: 1.5em; - background-color: #AAB3B8; -} .scorm_item_section{ - background: #2b3d53; /* Old browsers */ - background: -moz-linear-gradient(top, #2b3d53 0%, #2c3d4d 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2b3d53), color-stop(100%,#2c3d4d)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #2b3d53 0%,#2c3d4d 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #2b3d53 0%,#2c3d4d 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #2b3d53 0%,#2c3d4d 100%); /* IE10+ */ - background: linear-gradient(to bottom, #2b3d53 0%,#2c3d4d 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2b3d53', endColorstr='#2c3d4d',GradientType=0 ); /* IE6-9 */ - padding-top: 10px; - padding-bottom: 10px; - font-size: 14px; - color: #ffffff; - /* border-top-left-radius:5px; - border-top-right-radius: 5px;*/ -} -.scorm_item_section .scorm_section_level_0{ - padding-left: .5em; - padding-right: .5em; -} -.scorm_item_section .scorm_section_level_1{ - padding-left: 1.5em; - padding-right: .5em; -} -.scorm_item_section .scorm_section_level_2{ - padding-left: 2.5em; - padding-right: .5em; + border-bottom: 1px solid #DDD; + font-size: 12px; + font-weight: bold; } -.scorm_item_section .scorm_section_level_3{ - padding-left: 3.5em; - padding-right: .5em; +.scorm_item_section .section{ + background:url("../../main/img/scorm/folder-item-closed.png") no-repeat left center; } - -.scorm_item_normal .scorm_item_level_0{ - padding-left: 1.5em; -} -.scorm_item_normal{ - padding:5px; - margin-left: 10px; +.scorm_item_section.scorm_completed .section{ + background:url("../../main/img/scorm/folder-item-open.png") no-repeat left center; + padding-right: 1.5em; } .scorm_item_normal a.items-list{ color: #666666; + font-size: 12px; } .scorm_item_normal a:hover{ text-decoration: none; } -.scorm_item_normal.scorm_completed { +.scorm_item_normal.scorm_completed{ + background-color: #F5F5F5; +} +.scorm_item_section.scorm_completed{ + background-color: #F5F5F5; + color: #000; +} +.scorm_completed .item { background:url("../../main/img/scorm/scorm_completed.png") no-repeat left center; } -.scorm_item_normal.scorm_failed{ +.scorm_completed .item a{ + color: #000; +} +.scorm_failed .item{ background:url("../../main/img/scorm/scorm_failed.png") no-repeat left center; } -.scorm_item_normal.scorm_not_attempted{ +.scorm_not_attempted .item{ background:url("../../main/img/scorm/scorm_not_attempted.png") no-repeat left center; } -.scorm_item_normal.scorm_highlight{ +.scorm_highlight .item{ background:url("../../main/img/scorm/scorm_highlight.png") no-repeat left center !important; color: #009AB8; } -.scorm_item_normal.scorm_highlight.scorm_completed{ +.scorm_highlight.scorm_completed .item{ background:url("../../main/img/scorm/scorm_current.png") no-repeat left center !important; - color: #009AB8; } -.scorm_item_normal.scorm_highlight.scorm_failed{ +.scorm_highlight.scorm_failed .item{ background:url("../../main/img/scorm/scorm_failed.png") no-repeat left center !important; - color: #009AB8; } -.scorm_item_normal.scorm_highlight a{ - color: #009AB8 !important; +.scorm_highlight a{ + color: #FFFFFF !important; +} +.scorm_item_normal.scorm_highlight{ + background-color: #00AAD4; } /* END SCORM CSS BASE*/ @@ -309,29 +281,25 @@ See https://support.chamilo.org/issues/6976 padding-bottom: 10px; } .scorm-title{ - color: #666; - font-size: 16px; - font-weight: 700; + color: #333; + font-size: 18px; + font-weight: bold; line-height: 1.5em; - margin: 0 0 10px; + margin: 0 0 15px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + padding-bottom: 5px; + border-bottom: 1px solid #DDD; } - #learning_path_right_zone .lp-view-tabs li a { padding: 5px 10px; } - - - -/* Extra small devices (mobiles, 767px and down) */ #learning_path_main { height: 100%; margin: 0; overflow: hidden; } - #learning_path_left_zone, #learning_path_right_zone { bottom: 0; @@ -345,7 +313,6 @@ See https://support.chamilo.org/issues/6976 transition-property: left width; transition-duration: 0.5s; } - #learning_path_left_zone .lp-view-zone-container, #learning_path_right_zone .lp-view-zone-container { bottom: 0; @@ -355,7 +322,6 @@ See https://support.chamilo.org/issues/6976 right: 0; top: 0; } - #learning_path_toc { bottom: 5px; left: 5px; @@ -366,12 +332,10 @@ See https://support.chamilo.org/issues/6976 transition-property: top; transition-duration: 0.1s; } - #learning_path_right_zone { left: 100%; width: 100%; } - #learning_path_right_zone .lp-view-tabs .tab-content { bottom: 5px; left: 5px; @@ -388,11 +352,9 @@ See https://support.chamilo.org/issues/6976 height: 100%; width: 100%; } - #learning_path_main.lp-view-collapsed #learning_path_left_zone { left: -100%; } - #learning_path_main.lp-view-collapsed #learning_path_right_zone { left: 0; width: 100%; @@ -449,13 +411,13 @@ See https://support.chamilo.org/issues/6976 color: #ffffff; } #learning_path_toc { - bottom: 10px; - left: 10px; - right: 5px; - margin-top:20px; - border: 1px solid #ddd; - padding: 10px; - border-radius: 5px; + bottom: 10px; + left: 10px; + right: 5px; + margin-top:20px; + border: 1px solid #ddd; + padding: 10px; + border-radius: 5px; } /* Small devices (tablets, 768px and up) */ @media (min-width: 768px) { diff --git a/main/img/scorm/folder-item-closed.png b/main/img/scorm/folder-item-closed.png new file mode 100644 index 0000000000..874a09df0c Binary files /dev/null and b/main/img/scorm/folder-item-closed.png differ diff --git a/main/img/scorm/folder-item-open.png b/main/img/scorm/folder-item-open.png new file mode 100644 index 0000000000..cc0449a0fd Binary files /dev/null and b/main/img/scorm/folder-item-open.png differ diff --git a/main/img/scorm/scorm_completed.png b/main/img/scorm/scorm_completed.png index e0c505fb3c..0e64aea33e 100644 Binary files a/main/img/scorm/scorm_completed.png and b/main/img/scorm/scorm_completed.png differ diff --git a/main/img/scorm/scorm_current.png b/main/img/scorm/scorm_current.png index 4b49e4918e..cf2db1eadb 100644 Binary files a/main/img/scorm/scorm_current.png and b/main/img/scorm/scorm_current.png differ diff --git a/main/img/scorm/scorm_failed.png b/main/img/scorm/scorm_failed.png index 64e050cdb3..d45018f152 100644 Binary files a/main/img/scorm/scorm_failed.png and b/main/img/scorm/scorm_failed.png differ diff --git a/main/img/scorm/scorm_highlight.png b/main/img/scorm/scorm_highlight.png index ba46b238a7..188fc08d1b 100644 Binary files a/main/img/scorm/scorm_highlight.png and b/main/img/scorm/scorm_highlight.png differ diff --git a/main/img/scorm/scorm_not_attempted.png b/main/img/scorm/scorm_not_attempted.png index 70a783781f..e6826ee219 100644 Binary files a/main/img/scorm/scorm_not_attempted.png and b/main/img/scorm/scorm_not_attempted.png differ diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php index a85eef293f..ca83483ae3 100755 --- a/main/lp/learnpath.class.php +++ b/main/lp/learnpath.class.php @@ -3198,26 +3198,20 @@ class learnpath 'browsed' => 'scorm_completed', ]; - $scorm_color_background = 'row_odd'; - $style_item = ''; - - if ($color_counter % 2 == 0) { - $scorm_color_background = 'row_even'; - } + $rowColor = ' '; $dirTypes = self::getChapterTypes(); if (in_array($item['type'], $dirTypes)) { - $scorm_color_background ='scorm_item_section '; - $style_item = ''; + $rowColor ='scorm_item_section '; } if ($item['id'] == $this->current) { - $scorm_color_background = 'scorm_item_normal '.$scorm_color_background.' scorm_highlight'; + $rowColor = 'scorm_item_normal '.$rowColor.' scorm_highlight'; } elseif (!in_array($item['type'], $dirTypes)) { - $scorm_color_background = 'scorm_item_normal '.$scorm_color_background.' '; + $rowColor = 'scorm_item_normal '.$rowColor.' '; } - $html .= '
'; + $html .= '
'; // Learning path title $title = $item['title']; @@ -3235,9 +3229,9 @@ class learnpath } if (in_array($item['type'], $dirTypes)) { // Chapters - $html .= '
'; + $html .= '
'; } else { - $html .= '
'; + $html .= '
'; $html .= ''; } @@ -3251,7 +3245,7 @@ class learnpath } $html .= "
"; - if ($scorm_color_background != '') { + if ($rowColor != '') { $html .= '
'; }