diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 97b9ade6de..1679f422fe 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -3144,7 +3144,6 @@ a.forum_group_link { .subnav .nav > li > .logout { padding-top:8px; } - .subnav-fixed { position: fixed; top: 0px; @@ -3156,12 +3155,7 @@ a.forum_group_link { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - /*-webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - */ } - .doc_folder { margin-right:5px; margin-top:5px; @@ -3197,7 +3191,6 @@ a.forum_group_link { padding-left: 25px; box-shadow:none; } - .handle.expanded{ background-image: url('../../main/img/div_hide.gif'); background-repeat: no-repeat; @@ -3205,7 +3198,6 @@ a.forum_group_link { padding-left: 25px; box-shadow:none; } - .collapsible .handle{ background-image: url('../../main/img/div_hide.gif'); background-repeat: no-repeat; @@ -3213,7 +3205,6 @@ a.forum_group_link { padding-left: 25px; box-shadow:none; } - .collapsible .handle.collapsed{ background-image: url('../../main/img/div_show.gif'); background-repeat: no-repeat; @@ -3229,7 +3220,6 @@ a.forum_group_link { padding-left: 25px; box-shadow:none; } - .btn.show{ border:none; border-radius: 0; @@ -3244,7 +3234,6 @@ a.forum_group_link { background-position:center center; box-shadow:none; } - .btn.hide{ border:none; border-radius: 0; @@ -3259,7 +3248,6 @@ a.forum_group_link { background-position:center center; box-shadow:none; } - .btn.loading{ border:none; border-radius: 0; @@ -3283,7 +3271,6 @@ a.forum_group_link { .boot-tooltip { cursor: pointer; } - /* link */ @@ -3386,7 +3373,6 @@ i.size-32.icon-new-note{ .nav-list img { margin-right: 6px; } - /* Only for Firefox */ @-moz-document url-prefix() { select#question_type_hidden option { @@ -3409,12 +3395,9 @@ i.size-32.icon-new-note{ select#question_type_hidden option[value="14"] {background-image: url(../../main/img/icons/32/mcmagl.png);} select#question_type_hidden option[value="16"] {background-image: url(../../main/img/icons/32/calculated_answer.png);} } - - .btn-success.btn-install{ float: right; } - /* * work */ @@ -3493,7 +3476,6 @@ i.size-32.icon-new-work{ #settings .panel:hover .admin-edit-block { display: block; } - /***** Survey *****/ #list-survey p{ display: inline-block; @@ -3968,8 +3950,6 @@ i.size-32.icon-new-work{ height:20px; width: 70%; } - - .bottom_actions { display: block; } @@ -4068,11 +4048,9 @@ ul.holder li.bit-box{ -webkit-border-radius: 4px; -moz-border-radius: 4px; } - #file-descrtiption.form-control{ width: 80%; } - .session-course-edit .control{ padding-top: 2em; padding-bottom: 2em; @@ -4143,7 +4121,6 @@ ul.holder li.bit-box{ padding-left: 10px; margin-left: 0px; } - .question_options label > input + div.thumbnail { padding: 10px; box-sizing: border-box; @@ -4157,7 +4134,6 @@ ul.holder li.bit-box{ background: linear-gradient(to bottom, #ffffff 0%,#f6f6f6 47%,#ededed 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */ } - .question_options label > input:checked + div.thumbnail { border: 2px solid #337AB7; -webkit-box-shadow: 0 4px 18px #C8C8C8; @@ -4173,11 +4149,9 @@ ul.holder li.bit-box{ background: linear-gradient(to bottom, #ffffff 0%,#fffef2 47%,#ffffe2 100%); /* W3C */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ffffe2',GradientType=0 ); /* IE6-9 */ } - .question_options div.thumbnail p { margin: 0; } - .question_options div.thumbnail img { height: 150px !important; width: 190px !important; @@ -4192,7 +4166,6 @@ ul.holder li.bit-box{ display: block; height: auto !important; } - /*** Draggable answer ***/ .question_options ul.exercise-draggable-answer{ float: left; @@ -4269,7 +4242,6 @@ ul.exercise-draggable-answer .touch-items:hover{ font-size: 12px; cursor: pointer; } - /*** Matching Draggable answer ***/ .drag_question { min-height: 4em; @@ -4932,7 +4904,6 @@ div#chat-remote-video video { margin-left: auto; margin-right: auto; } - #session-list .information-item{ padding: 10px; min-height: 185px; @@ -5163,8 +5134,6 @@ div#chat-remote-video video { .ui-tabs .ui-widget-content a.btn-success{ color: #fff; } - - .ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary{ @@ -5202,7 +5171,6 @@ div#chat-remote-video video { .ui-dialog .ui-dialog-buttonpane{ border-top: 1px solid #DDD; } - .ui-button.ui-widget.ui-state-default { background-color:#f5f5f5; background-image:-moz-linear-gradient(top,#fff,#e6e6e6); @@ -5217,7 +5185,6 @@ div#chat-remote-video video { text-shadow:0 1px 1px rgba(255,255,255,.75); box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05) } - .ui-button.ui-widget.ui-state-hover{ border-width: 1px; border-style:solid; @@ -5228,9 +5195,6 @@ div#chat-remote-video video { font-weight:normal; color:#333333; } - - - .select2-container .select2-selection--single{ height: 32px !important; border-color: #CCCCCC !important; @@ -5412,24 +5376,19 @@ div#chat-remote-video video { .session-view-row { padding: 8px 0; } - .session-view-lvl-2 { margin-left : 66px; } - .session-view-lvl-3 { padding-left : 92px; } - .session-view-lvl-4 { padding-left : 102px; } - .session-view-lvl-5 { padding-left : 128px; font-weight : normal; } - .session-view-lvl-6 { padding-left : 20px; } @@ -5441,25 +5400,20 @@ div#chat-remote-video video { img.sessionView { margin-right: 10px; } - a.sessionView { font-weight : bold; } - .session-view-user-category { font-weight : bold; padding-bottom : 10px; } - .session-view-session-category { font-weight : bold; padding-bottom : 10px; } - .session-view-session { font-weight : bold; } - /* Like the well class */ .session-view-well { min-height: 20px; @@ -5470,16 +5424,13 @@ a.sessionView { border-radius: 4px; box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05) inset; } - .session-view-button { border : none; min-width : 28px; } - .view-by-session-link { min-height: 38px; } - .view-by-session-teachers { display : none; /* change this if you want to display teachers name in this view */ font-size : 10px; @@ -5487,15 +5438,12 @@ a.sessionView { overflow-y: auto; max-height:50px; } - .view-by-session-right-actions { float : right; } - .view-by-session-right-actions img { width : 12px; } - .session-view-session-go-to-course-in-session { font-size : 12px; } @@ -5680,11 +5628,9 @@ a.sessionView { } #grad_left { left: 0; - /* background: url('../../main/img/timeline/grad_left.png') repeat-y; */ } #grad_right { right: 0; - /* background: url('../../main/img/timeline/grad_right.png') repeat-y; */ } #next, #prev { @@ -5735,7 +5681,19 @@ a.sessionView { height: 144px; position: relative; } - +/* +* Lesson scorm +*/ +#subtab.tab-wrapper, +#resource_tab.tab-wrapper .tab-content .tab-pane{ + margin-top: 20px; +} +#resource_tab li a { + padding: 5px 10px; +} +#resource_tab li.lp_resource_element a{ + padding: 5px; +} /* CSS NEW TOP ******************************************************************************/ /* CSS Responsive */ @media (min-width: 1025px) and (max-width: 1200px) { diff --git a/app/bootstrap.php.cache b/app/bootstrap.php.cache index 35212edfb3..ae5ff197bb 100644 --- a/app/bootstrap.php.cache +++ b/app/bootstrap.php.cache @@ -1358,7 +1358,7 @@ const HTTP_REQUEST_URI_TOO_LONG = 414; const HTTP_UNSUPPORTED_MEDIA_TYPE = 415; const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416; const HTTP_EXPECTATION_FAILED = 417; -const HTTP_I_AM_A_TEAPOT = 418; const HTTP_UNPROCESSABLE_ENTITY = 422; const HTTP_LOCKED = 423; const HTTP_FAILED_DEPENDENCY = 424; const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425; const HTTP_UPGRADE_REQUIRED = 426; const HTTP_PRECONDITION_REQUIRED = 428; const HTTP_TOO_MANY_REQUESTS = 429; const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451; +const HTTP_I_AM_A_TEAPOT = 418; const HTTP_MISDIRECTED_REQUEST = 421; const HTTP_UNPROCESSABLE_ENTITY = 422; const HTTP_LOCKED = 423; const HTTP_FAILED_DEPENDENCY = 424; const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425; const HTTP_UPGRADE_REQUIRED = 426; const HTTP_PRECONDITION_REQUIRED = 428; const HTTP_TOO_MANY_REQUESTS = 429; const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451; const HTTP_INTERNAL_SERVER_ERROR = 500; const HTTP_NOT_IMPLEMENTED = 501; const HTTP_BAD_GATEWAY = 502; @@ -1407,7 +1407,7 @@ public static $statusTexts = array( 415 =>'Unsupported Media Type', 416 =>'Range Not Satisfiable', 417 =>'Expectation Failed', -418 =>'I\'m a teapot', 422 =>'Unprocessable Entity', 423 =>'Locked', 424 =>'Failed Dependency', 425 =>'Reserved for WebDAV advanced collections expired proposal', 426 =>'Upgrade Required', 428 =>'Precondition Required', 429 =>'Too Many Requests', 431 =>'Request Header Fields Too Large', 451 =>'Unavailable For Legal Reasons', 500 =>'Internal Server Error', +418 =>'I\'m a teapot', 421 =>'Misdirected Request', 422 =>'Unprocessable Entity', 423 =>'Locked', 424 =>'Failed Dependency', 425 =>'Reserved for WebDAV advanced collections expired proposal', 426 =>'Upgrade Required', 428 =>'Precondition Required', 429 =>'Too Many Requests', 431 =>'Request Header Fields Too Large', 451 =>'Unavailable For Legal Reasons', 500 =>'Internal Server Error', 501 =>'Not Implemented', 502 =>'Bad Gateway', 503 =>'Service Unavailable', @@ -2204,6 +2204,10 @@ if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE return; } throw $e; +} catch (\Throwable $e) { +unset($this->loading[$id]); +unset($this->services[$id]); +throw $e; } unset($this->loading[$id]); return $service; @@ -2428,11 +2432,11 @@ protected $booted = false; protected $name; protected $startTime; protected $loadClassCache; -const VERSION ='2.8.6'; -const VERSION_ID = 20806; +const VERSION ='2.8.7'; +const VERSION_ID = 20807; const MAJOR_VERSION = 2; const MINOR_VERSION = 8; -const RELEASE_VERSION = 6; +const RELEASE_VERSION = 7; const EXTRA_VERSION =''; const END_OF_MAINTENANCE ='11/2018'; const END_OF_LIFE ='11/2019'; @@ -3321,6 +3325,10 @@ $response = parent::handle($request, $type, $catch); $this->container->set('request', null,'request'); $this->container->leaveScope('request'); throw $e; +} catch (\Throwable $e) { +$this->container->set('request', null,'request'); +$this->container->leaveScope('request'); +throw $e; } $this->container->set('request', null,'request'); $this->container->leaveScope('request'); diff --git a/main/img/icons/128/add_learnpath_section.png b/main/img/icons/128/add_learnpath_section.png new file mode 100644 index 0000000000..bc7ab01a65 Binary files /dev/null and b/main/img/icons/128/add_learnpath_section.png differ diff --git a/main/img/icons/22/add_learnpath_section.png b/main/img/icons/22/add_learnpath_section.png index ae673acc7f..1e7171b818 100755 Binary files a/main/img/icons/22/add_learnpath_section.png and b/main/img/icons/22/add_learnpath_section.png differ diff --git a/main/img/icons/32/add_learnpath_section.png b/main/img/icons/32/add_learnpath_section.png index aba24120fe..a178b4ee91 100755 Binary files a/main/img/icons/32/add_learnpath_section.png and b/main/img/icons/32/add_learnpath_section.png differ diff --git a/main/img/icons/48/add_learnpath_section.png b/main/img/icons/48/add_learnpath_section.png index 9c62e0caaa..f3ca5accc0 100755 Binary files a/main/img/icons/48/add_learnpath_section.png and b/main/img/icons/48/add_learnpath_section.png differ diff --git a/main/img/icons/64/add_learnpath_section.png b/main/img/icons/64/add_learnpath_section.png index 26ff1d98c4..e4b2c71140 100755 Binary files a/main/img/icons/64/add_learnpath_section.png and b/main/img/icons/64/add_learnpath_section.png differ diff --git a/main/img/icons/svg/add_learnpath_section.svg b/main/img/icons/svg/add_learnpath_section.svg index 04c86c9675..4c5bc53211 100644 --- a/main/img/icons/svg/add_learnpath_section.svg +++ b/main/img/icons/svg/add_learnpath_section.svg @@ -15,7 +15,7 @@ viewBox="0 0 128 128" id="svg10831" version="1.1" - inkscape:version="0.91 r" + inkscape:version="0.91 r13725" sodipodi:docname="add_learnpath_section.svg"> @@ -71,17 +71,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="3.959798" - inkscape:cx="93.78989" - inkscape:cy="62.578288" + inkscape:zoom="2.8" + inkscape:cx="72.376621" + inkscape:cy="60.85592" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="1920" - inkscape:window-height="1051" - inkscape:window-x="1366" - inkscape:window-y="0" + inkscape:window-width="1325" + inkscape:window-height="747" + inkscape:window-x="41" + inkscape:window-y="21" inkscape:window-maximized="1" showguides="false" /> image/svg+xml - + @@ -101,99 +101,113 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-924.36216)"> - + id="g4259" + inkscape:export-filename="/var/www/chamilo11/main/img/icons/22/add_learnpath_section.png" + inkscape:export-xdpi="15.46875" + inkscape:export-ydpi="15.46875"> + ry="0" + y="924.36218" + x="0" + height="128" + width="128" + id="rect4244" + style="opacity:0;fill:#a1a1a1;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect15963" + width="95.986" + height="119.05708" + x="16.14473" + y="928.95605" + ry="7.1435895" /> + + + + + + - - - - - - - - + ry="6.0862489" + y="931.55127" + x="19.18972" + height="113.86665" + width="90.002113" + id="rect15965" + style="fill:url(#linearGradient16495);fill-opacity:1;stroke:#949494;stroke-opacity:1" /> + + + + + + + - diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php index f2414f3a00..cc035a72a6 100755 --- a/main/lp/learnpath.class.php +++ b/main/lp/learnpath.class.php @@ -8839,7 +8839,7 @@ class learnpath $return = '
    '; $return .= '
  • '; - $return .= Display::return_icon('new_test_small.gif'); + $return .= Display::return_icon('new_exercice.png'); $return .= '' . get_lang('NewExercise') . ''; $return .= '
  • '; @@ -9035,7 +9035,7 @@ class learnpath //First add link $return .= '
  • '; - $return .= Display::return_icon('forum_new_small.gif'); + $return .= Display::return_icon('new_forum.png'); $return .= Display::url( get_lang('CreateANewForum'), api_get_path(WEB_CODE_PATH) . 'forum/index.php?' . api_get_cidreq() . '&' . http_build_query([ diff --git a/main/lp/lp_add_item.php b/main/lp/lp_add_item.php index 9ceed495fe..a2640159ab 100755 --- a/main/lp/lp_add_item.php +++ b/main/lp/lp_add_item.php @@ -149,11 +149,6 @@ $suredel = trim(get_lang('AreYouSureToDeleteJS')); #resExercise .ui-selected { background: #F39814; color: white; } #resExercise { list-style-type: none; margin: 0; padding: 0; width: 60%; } #resExercise li { margin: 3px; padding: 0.4em; font-size: 1.4em; height: 18px; } - - /* Fixes LP toolbar */ - #resource_tab li a { - padding: 5px 4px; - }