1.10.x
Yannick Warnier 10 years ago
commit bbf54eacb3
  1. 75
      app/Migrations/Schema/V110/Version20150812230500.php
  2. 1591
      app/Resources/public/css/base_chamilo.css
  3. 44
      app/Resources/public/css/frames.css
  4. 89
      app/Resources/public/css/scorm.css
  5. 989
      app/Resources/public/css/themes/chamilo/frames.css
  6. BIN
      app/Resources/public/css/themes/chamilo/images/scorm_completed.png
  7. BIN
      app/Resources/public/css/themes/chamilo/images/scorm_highlight.png
  8. BIN
      app/Resources/public/css/themes/chamilo/images/scorm_not_attempted.png
  9. 14
      app/Resources/public/css/themes/chamilo/learnpath.css
  10. 14
      main/exercice/exercise_report.php
  11. 32
      main/exercice/exercise_show.php
  12. BIN
      main/img/scorm/scorm_completed.png
  13. BIN
      main/img/scorm/scorm_current.png
  14. 0
      main/img/scorm/scorm_failed.png
  15. BIN
      main/img/scorm/scorm_highlight.png
  16. BIN
      main/img/scorm/scorm_not_attempted.png
  17. 1
      main/inc/lib/javascript/jquery.lp_minipanel.js
  18. 8
      main/inc/lib/pdf.lib.php
  19. 2
      main/inc/lib/svg-edit/extensions/imagelib/groups.php
  20. 2
      main/inc/lib/svg-edit/extensions/imagelib/index.php
  21. 2
      main/inc/lib/svg-edit/extensions/imagelib/users.php
  22. 7
      main/install/data.sql
  23. 2
      main/lang/english/trad4all.inc.php
  24. 2
      main/lang/spanish/trad4all.inc.php
  25. 13
      main/newscorm/learnpath.class.php
  26. 11
      main/newscorm/lp_view.php
  27. 51
      main/template/default/learnpath/view.tpl
  28. 12
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php

@ -0,0 +1,75 @@
<?php
/* For licensing terms, see /license.txt */
namespace Application\Migrations\Schema\V110;
use Application\Migrations\AbstractMigrationChamilo;
use Doctrine\DBAL\Schema\Schema;
/**
* Class Version20150812230500
*
* @package Application\Migrations\Schema\V11010
*/
class Version20150812230500 extends AbstractMigrationChamilo
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->addSettingCurrent(
'allow_coach_feedback_exercises',
null,
'radio',
'Session',
'false',
'AllowCoachFeedbackExercisesTitle',
'AllowCoachFeedbackExercisesComment',
null,
null,
1,
true,
false,
[
['value' => 'true', 'text' => 'Yes'],
['value' => 'false', 'text' => 'No']
]
);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entityManage = $this->getEntityManager();
$deleteOptions = $entityManage->createQueryBuilder();
$deleteOptions->delete('ChamiloCoreBundle:SettingsOptions', 'o')
->andWhere(
$deleteOptions->expr()->in(
'o.variable',
[
'allow_coach_feedback_exercises'
]
)
);
$deleteOptions->getQuery()->execute();
$deleteSettings = $entityManage->createQueryBuilder();
$deleteSettings->delete('ChamiloCoreBundle:SettingsCurrent', 's')
->andWhere(
$deleteSettings->expr()->in(
's.variable',
[
'allow_coach_feedback_exercises'
]
)
);
$deleteSettings->getQuery()->execute();
}
}

File diff suppressed because it is too large Load Diff

@ -0,0 +1,44 @@
/*
Theme Name: Frame Scorm
URI Project: http://www.chamilo.org
Description: Styles main base of Chamilo LMS appearance, works with Bootstrap 3.0.x
Author:
alex.aragon@beeznest.com
Version: 1.0
*/
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,300italic,400italic);
body{
color: #666;
font-family: 'Open Sans', sans-serif;
padding: 20px;
line-height: 30px;
background: #E8F5FC;
}
a{
text-decoration: none;
color: #00829C;
}
a:hover{
text-decoration: underline;
}
h1{
border-radius: 5px;
border: 1px solid #ccc;
padding-top: 10px;
padding-bottom: 10px;
/* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#ffffff+0,e5e5e5+100;White+3D */
background: #ffffff; /* Old browsers */
background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* IE10+ */
background: linear-gradient(to bottom, #ffffff 0%,#e5e5e5 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
}
img{
border: 1px solid #ccc;
border-radius: 5px;
padding: 5px;
background: #fff;
}

@ -67,11 +67,12 @@ See https://support.chamilo.org/issues/6976
#learning_path_left_zone .description-autor{
color: #666666;
font-size: 12px;
text-align: left;
line-height: 20px;
}
.inner_lp_toc {
overflow: auto;
border-top: 1px solid #dcdcdc;
}
.inner_lp_toc .scorm_item a {
@ -111,20 +112,11 @@ See https://support.chamilo.org/issues/6976
}
.inner_lp_toc .scorm_item_section {
border:1px solid #222;
background:#333;
font-weight:bold;
color:#fff;
text-shadow:0 -1px 1px #000;
background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#333));
background-image:-webkit-linear-gradient(top,#555,#333);
background-image:-moz-linear-gradient(top,#555,#333);
background-image:-ms-linear-gradient(top,#555,#333);
background-image:-o-linear-gradient(top,#555,#333);
background-image:linear-gradient(top,#555,#333);
margin-right: 1px;
padding: 10px 0px 10px 0px;
text-decoration: none;
background:#E8ECEF;
color:#666;
padding: 5px 0px 5px 0px;
font-size: 12px;
font-weight: bold;
}
.inner_lp_toc .scorm_item {
@ -209,6 +201,7 @@ See https://support.chamilo.org/issues/6976
-moz-border-radius: 0;
-webkit-border-radius: 0;
color: #ffffff;
font-size: 12px;
}
#learning_path_breadcrumb_zone .breadcrumb a{
color: #ffffff;
@ -278,9 +271,9 @@ See https://support.chamilo.org/issues/6976
overflow-y:scroll;
}
.scorm-heading{
font-size: 16px;
font-weight: bold;
padding: 10px;
font-size: 14px;
padding-top: 5px;
padding-bottom: 5px;
}
#control-bottom{
position: fixed;
@ -292,9 +285,6 @@ See https://support.chamilo.org/issues/6976
#control-bottom.well{
margin-bottom: 0;
}
/*SCORM CSS BASE */
#learning_path_left_zone .home{
display: inline-block;
@ -316,8 +306,9 @@ See https://support.chamilo.org/issues/6976
}
/* for section */
.scorm_item_section.scorm_completed{
background:url("../../main/img/icon_completed_section.png")no-repeat 98% center #606c88;
color: #ffffff;
padding-right: 1.5em;
background-color: #AAB3B8;
}
.scorm_item_section{
background: #2b3d53; /* Old browsers */
@ -353,36 +344,52 @@ See https://support.chamilo.org/issues/6976
}
.scorm_item_normal .scorm_item_level_0{
/* padding-left: .5em;
padding-right: 1.5em;
padding-top: 10px;
padding-bottom: 10px;
*/
padding-left: 1.5em;
}
.scorm_item_normal{
padding:0;
border-bottom: 1px solid #DCDCDC;
padding:5px;
margin-left: 10px;
}
.scorm_item_normal a.items-list{
color: #666666;
text-decoration: none;
display: block;
padding-left: 2em;
padding-right: 1.5em;
padding-top: 5px;
padding-bottom: 5px;
}
.scorm_item_normal a:hover{
text-decoration: none;
}
.scorm_highlight{
background-color: #2B3D50 !important;
}
.scorm_highlight a{
color: #ffffff !important;
}
#scorm-info .panel-heading{
padding: 5px;
}
#scorm-info #progress_bar .progress{
margin-bottom: 5px;
}
.scorm-body .scorm-title{
font-size: 18px;
margin-top: 5px;
margin-bottom: 5px;
color: #666;
}
.scorm-body .scorm-title .fa-book{
color: #00829C;
}
.scorm_item_normal.scorm_completed {
background:url("../../main/img/scorm/scorm_completed.png") no-repeat left center;
}
.scorm_item_normal.scorm_failed{
background:url("../../main/img/scorm/scorm_failed.png") no-repeat left center;
}
.scorm_item_normal.scorm_not_attempted{
background:url("../../main/img/scorm/scorm_not_attempted.png") no-repeat left center;
}
.scorm_item_normal.scorm_highlight{
background:url("../../main/img/scorm/scorm_highlight.png") no-repeat left center !important;
color: #009AB8;
}
.scorm_item_normal.scorm_highlight.scorm_completed{
background:url("../../main/img/scorm/scorm_current.png") no-repeat left center !important;
color: #009AB8;
}
.scorm_item_normal.scorm_highlight a{
color: #009AB8 !important;
}
/* END SCORM CSS BASE*/

@ -1,989 +0,0 @@
body {
font-family: verdana, arial, helvetica, sans-serif;
font-size: 12px;
color: #000;
margin: 10px;
padding: 0;
background-color: #fff;
}
img {
border: none;
}
#outerframe {
position: relative; /* do not remove, fixes a bug in IE */
border: 1px solid #fff;
background-color: #fff;
}
/* Hides from IE5-mac \*/
* html #outerframe {
height: 1%;
}
/* End hide from IE5-mac */
/*****************************************************
* HEADER STYLES *
*****************************************************/
#header {
width: 100%;
padding: 0;
margin: 0;
}
/* Header 1: Containing title, portal and organization */
#header1 {
font-size: 12px;
padding: 4px;
background-color: #264269;
color: #fff;
border-bottom: 1px solid white;
}
#header1 a {
color: #ffffff;
text-decoration: none;
}
#header1 a:hover {
text-decoration: underline;
}
#sitename {
margin: 0;
font-weight: bold;
}
#institution {
float: left;
font-weight: bold;
}
#my_courses {
float: right;
font-weight: bold;
}
#logout {
float: right;
width:20%;
text-align:right;
}
/* The tool shortcuts */
#toolshortcuts {
text-align: right;
}
/*****************************************************
* FOOTER STYLES *
*****************************************************/
#footer {
padding: 8px;
border-top: 1px solid #4171B5;
background-color: #E5EDF9;
font-size: 12px;
}
#footer .copyright {
float: right;
}
/*****************************************************
* MAIN STYLES *
*****************************************************/
#main {
position: relative; /* to avoid the IE peekabo bug*/
margin: 0px auto;
margin-top: 10px;
width: 98%;
padding: 0px 10px 10px 10px;
background-color: #fff;
min-height: 320px;
}
/* for content section in main index.php file */
.maincontent {
float: left;
width: 78%;
padding: 4px;
background-color: #fff;
}
/* "menu" classes for menu/navigation section in main index.php */
.menu {
float: right;
width: 20%;
padding: 0 0 6px 0;
background-color: #E5EDF9;
border: 1px solid #4171B5;
}
.menucaption {
font-size: 12px;
font-weight: bold;
padding-left: 12px;
}
.menusection {
width: auto;
margin: 24px 6px 0 6px;
padding-left: 10px;
border: 1px solid #4171B5;
}
.menusectioncaption {
position: relative;
top: -9px;
background-color: #E5EDF9;
font-size: 12px;
padding: 0 8px 0 4px;
}
.menulist {
list-style: none;
margin: 0 0 12px 0;
padding: 0;
}
#lang_form {
text-align: left;
font-size: 12px;
margin: 2px 0 10px 0;
padding: 2px;
}
#lang_form input, #lang_form select {
font-size: 12px;
}
#loginform label {
font-size: 12px;
margin: 4px 6px;
}
#loginform input {
display: block;
font-size: 13px;
margin: 4px 6px;
}
#login_fail {
margin: 0 6px 6px 6px;
padding: 4px;
border: 1px solid #f00;
background-color: #fff;
font-size: 12px;
color: #f00;
}
/*** layout divs for course and tool pages (being tested in some pages) ****/
#contentfloatholder {/* also makes the right "sliding" tab */
/*background: url(../pics/sidebar-r.gif) repeat-y 100% 0;
background: url(../pics/bg_fountain.jpg) no-repeat 100% 0; */
float: left;
width: 100%;
position: relative;
}
#contentfloatholder:after {
/* this is for NN6 to clear floats */
content: ".";
display: block;
height: 0px;
clear: both;
visibility: hidden;
}
#centerwrap {
float: left;
width: 100%;
margin-right: -95%;/* this needs to be less than 100% for Moz/Mac which thinks
it's empty otherwise. The difference is made up by putting a
negative left margin on the left float:
Note IE/Mac doesn't like this method ~ it wants the 100% so it can
be fed in using IE only CSS below becasue IE/Win also works with the 100% method.
*/
}
#center {
margin: 0 0 0 180px;
padding: 10px 0 40px 0;
min-height: 300px;
}
#left {
float: left;
width: 180px;
padding: 20px 0 0 0;
margin-left: -5%; /* the difference to make the left colum appear flush left */
}
/* --- left navigation box menu as a definition list --- */
#leftnavbox {
margin: 0;
padding: 0;
float:left;
}
#leftnavbox dl {
width: 160px;
margin: 12px auto 4px auto;
padding: 0 0 10px 0;
background: transparent;
font-size: 12px;
text-align: center;
}
#leftnavbox dt {
margin: 0;
padding: 1px 2px;
font-weight: bold;
font-size: 12px;
text-align: center;
color: #000;
border-bottom: 1px solid #fff;
background: transparent;
}
#leftnavbox dd {
margin: 0;
padding: 0;
color: #009;
text-align: left;
border-bottom:1px solid #fff;
background: #ccf;
}
#leftnavlist a, #leftnavlist a:link {
display: block;
color: #fff;
text-decoration: none;
padding: 2px 5px 2px 10px;
background: #4171B5;
width:140px;
border: 1px solid #009;
}
#leftnavlist a:visited {
color:#eee;
text-decoration: none;
display: block;
padding: 2px 5px 2px 10px;
background: #4171B5;
color: #eee;
width:140px;
}
#leftnavlist a:hover {
background: #fff;
color:#4171B5;
display: block;
}
/* --- end of left side definition list menu section --- */
/* various sections in course-home.php file */
#toolremove {
width: 40%;
color: #f00;
font-weight: bold;
margin: 10px auto;
padding: 10px;
border: 2px solid #f00;
}
#courseintro {
clear: both;
width: 80%;
margin: 10px auto;
padding: 10px;
border-bottom: 1px solid #4171B5;
}
#courseintro_icons {
clear: both;
width: 80%;
margin: 10px auto;
}
.everybodyview {
position: relative; /* to avoid the IE peekabo bug ?*/
width: 80%;
margin: 10px auto;
padding: 10px;
}
.courseadminview, .platformadminview {
position: relative;
width: 80%;
margin: 25px auto 10px;
padding: 10px;
border: 1px solid #4171B5;
}
.viewcaption {
position: relative;
top: -20px;
font-size: 12px;
font-weight: bold;
color: #4171B5;
background-color: #fff;
padding: 0 4px;
}
/***********************************/
/* ===================================================
AGENDA STYLES
===================================================*/
/* ---------------------------------------------------
check if these are still used or not
-----------------------------------------------------*/
#agenda {
width: 100%;
margin: 0 auto;
border: 1px solid #4171B5;
border-collapse: collapse;
}
.agenda_month_divider {
background-color: #4171B5;
font-weight: bold;
font-size: 12px;
color: #fff;
text-align: center;
}
#agenda #title a {
color: #fff;
}
#agenda .agendaitem {
font-size: 12px;
}
#smallcalendar #title {
background-color: #4171B5;
font-weight: bold;
padding: 2px;
color: #fff;
text-align: center;
font-size: 11px;
}
#smallcalendar #title a {
color: #fff;
}
#agenda_select {
list-style: none;
border: 0px solid green;
margin: 30px 0 0 0;
padding: 0 0 0 10px;
}
/* ---------------------------------------------------
styles for the agenda (day, week, month view)
-----------------------------------------------------*/
#agenda_list {
width: 100%;
margin: 0 auto;
border: 1px solid #fff;
border-collapse: collapse;
}
/*The caption of the calendar (displays the month and the << and >> links*/
#agenda_list #title {
background-color: #4171B5;
font-weight: bold;
font-size: 12px;
color: #fff;
text-align: left;
padding: 2px 10px;
text-align: center;
border: 1px solid #264269;
}
#agenda_list #title a:link, #agenda_list #title a:visited {
background-color: #4171B5;
font-weight: bold;
font-size: 12px;
color: #fff;
text-align: left;
padding: 2px 10px;
text-align: center;
}
#agenda_list #title a:hover {
background-color: #4171B5;
font-weight: bold;
font-size: 12px;
color: #ff0000;
text-align: left;
padding: 2px 10px;
text-align: center;
}
/* The cells with the name of the days of the weeks (mon->sun)*/
#agenda_list .weekdays {
background-color: #D3DFF1;
text-align: center;
font-weight: bold;
border: 1px solid #264269;
border-collapse: collapse;
}
/* The cells for the days (1->31) */
#agenda_list .days_week {
height: 40px;
width: 12%;
text-align: left;
vertical-align: top;
border: 1px solid #264269;
border-collapse: collapse;
background-color: #f5f5f5;
}
#agenda_list .days_weekend {
height: 40px;
width: 12%;
text-align: left;
vertical-align: top;
border: 1px solid #264269;
border-collapse: collapse;
background-color: #e6e6e6;
}
#agenda_list .days_today {
height: 40px;
width: 12%;
text-align: left;
vertical-align: top;
border: 1px solid #264269;
border-collapse: collapse;
background-color: #FFCA8D;
color: #CC3300;
font-weight: bold;
}
/* text in the cells: display of agenda items (visible)*/
#agenda_list .data {
background-color: #eee;
text-align: left;
padding: 2px 10px;
font-weight: bold;
border: 0px solid #4171B5;
border-collapse: collapse;
}
#agenda_list .datanotbold {
background-color: #eee;
text-align: left;
padding: 2px 10px;
font-weight: normal;
border: 0px solid #4171B5;
border-collapse: collapse;
}
#agenda_list .text {
background-color: #fff;
text-align: left;
padding: 2px 10px;
font-weight: normal;
border: 0px solid #4171B5;
border-collapse: collapse;
}
/*text in the cells: display of agenda items (invisible)*/
#agenda_list .data_hidden {
background-color: #eee;
text-align: left;
padding: 2px 10px;
font-weight: bold;
border: 0px solid #4171B5;
border-collapse: collapse;
color: #999999;
}
#agenda_list .datanotbold_hidden {
background-color: #eee;
text-align: left;
padding: 2px 10px;
font-weight: normal;
border: 0px solid #4171B5;
border-collapse: collapse;
color: #999999;
}
#agenda_list .text_hidden {
background-color: #fff;
text-align: left;
padding: 2px 10px;
font-weight: normal;
border: 0px solid #4171B5;
border-collapse: collapse;
color: #999999;
}
/*text in the cells: display of agenda items (highlighted)*/
#agenda_list .datanow {
background-color: #FFCC00;
text-align: left;
padding: 2px 10px;
font-weight: bold;
border: 0px solid #4171B5;
border-collapse: collapse;
}
#agenda_list .datanotboldnow {
background-color: #FFCC00;
text-align: left;
padding: 2px 10px;
font-weight: normal;
border: 0px solid #4171B5;
border-collapse: collapse;
}
#agenda_list .textnow {
background-color: #fff;
text-align: left;
padding: 2px 10px;
font-weight: normal;
border: 0px solid #4171B5;
border-collapse: collapse;
}
/* ---------------------------------------------------
styles for the mini agenda
-----------------------------------------------------*/
#smallcalendar {
width: 100%;
margin: 0 auto;
border: 1px solid #fff;
border-collapse: collapse;
}
#smallcalendar .weekdays {
background-color: #D3DFF1;
text-align: center;
font-size: 11px;
font-weight: bold;
border: 1px solid #fff;
border-collapse: collapse;
}
#smallcalendar .days_week {
background-color: #f5f5f5;
text-align: center;
font-size: 11px;
border-collapse: collapse;
}
#smallcalendar .days_weekend {
background-color: #e6e6e6;
text-align: center;
font-size: 11px;
border: 1px solid #fff;
border-collapse: collapse;
}
#smallcalendar .days_today {
width: 12%;
text-align: center;
font-size: 11px;
border: 1px solid #FA8500;
border-collapse: collapse;
background-color: #FFCA8D;
}
/* ---------------------------------------------------
styles for the personal agenda
-----------------------------------------------------*/
.personal_agenda {
color: #008000;
}
.personal_agenda a:link, .personal_agenda a:visited {
color: #008000;
}
a.personal_agenda:link, a.personal_agenda:visited {
color: #008000;
}
.personal_agenda a:hover, .personal_agenda a:hover {
color: #666666;
}
a.personal_agenda:hover, a.personal_agenda:hover {
color: #666666;
}
/* normal and erro message-box */
.normal-message, .error-message {
position: relative;
margin: 10px auto;
margin-left: -250px;
width: 500px;
left: 50%;
right: 50%;
border-width: 1px;
border-style: solid;
padding: 5px;
}
.normal-message {
border: 1px solid #FF8001;
color: #000;
background-color: #FDC77E;
}
.error-message {
border: 1px solid #3F70AC;
color: #000;
background-color: #FDC273;
}
#message {
margin: 0 auto;
text-align: center;
}
#message select {
margin: 10px 0;
width: 220px;
}
#message textarea {
margin: 10px 0;
}
#message td {
padding: 4px;
}
/* styles from the document.php file */
.comment {
margin-left: 30px;
}
.invisible {
color: #999;
}
.invisible a:link, .invisible a:visited {
color: #999;
}
a.invisible:link, a.invisible:visited {
color: #999;
}
/* styles from the upload.php file */
dl.upload_option {
margin: 1em 0;
padding: 0;
}
.upload_option dt {
font-weight:bold;
margin:0;
}
.upload_option dd {
margin:0;
}
/* styles from dropbox.php file */
.dropbox_detail {
font-size: small
}
.dropbox_date {
font-style: italic
}
.dropbox_person {
font-weight: bold
}
.dropbox_listTitle {
color: #000000;
}
.dropbox_feedback {
font-size: x-small;
height: 50px;
width: 200px;
overflow: auto
}
.dropbox_feedbacks {
height: 250px;
width: 100%;
overflow: auto
}
/* styles for chat / conference tools */
#chat_entermessage {
background-color: #D6E5FA;
border-top: 1px solid #4171B5;
padding: 5px;
margin: 0;
}
/* styles for general formatting */
.clear {
clear: both;
line-height: 0;
height: 0;
}
p, blockquote, ol, ul {
font-size: 12px;
}
h1 {
font-size: 21px;
}
h2 {
font-size: 18px;
}
h3 {
font-size: 15px;
margin-top:0px;
padding-top:0px;
}
h4 {
font-size: 12px;
}
h5, h6 {
font-family: verdana, arial, helvetica, sans-serif;
}
/* the following for regular <a> elements */
a:link {
text-decoration: none;
font-weight : bold;
color : #4171b5;
}
a:visited {
text-decoration: none;
font-weight : bold;
color : #4171b5;
}
a:hover {
text-decoration: none;
color: red;
font-weight: bold
}
a:active {
text-decoration: none;
font-weight : bold;
color : #f00;
}
input.link_alike {
background-color: #FFFFFF;
border-width: 0px;
color: #4171b5;
font-weight: bold;
text-align: left;
padding: 0px;
margin: 0px;
}
input.link_alike:hover {
background-color: #FFFFFF;
border-width: 0px;
color: #FF0000;
font-weight: bold;
text-align: left;
padding: 0px;
margin: 0px;
}
/* the following for the greyed out elements */
a.nobold:link, a.nobold:visited, a.nobold:active {
font-weight: normal;
color: #999;
margin: 0 0 0 25px;
}
a.nobold:hover {
font-weight: normal;
color: #999;
text-decoration: underline;
margin: 0 0 0 25px;
}
.note {
margin: 6px;
font-size: 12px;
line-height: 14px;
font-family: verdana, arial, helvetica, sans-serif;
background-color: #FFF089;
color: #4171B5;
border: 1px solid #4171B5;
padding: 4px;
}
.alternativeBgLight {
background-color: #f5f5f5;
border: 1px solid #4171B5;
border-collapse: collapse;
}
.alternativeBgDark {
background-color: #ccf;
border: 1px solid #4171B5;
border-collapse: collapse;
}
.myagendatoday {
background-color: #FFCA8D;
border-collapse: collapse;
font-family: verdana, arial, helvetica, sans-serif;
color: #CC3300;
font-weight: bold;
}
/* Form elements - some general styling*/
select, textarea {
color : #000;
border: 1px solid #000;
}
input.checkbox {
border-width: 0;
}
input.mainoption {
font-weight : bold;
} /* Main submit button */
input.liteoption {
font-weight : normal;
} /* None-bold submit button */
select, input[type=checkbox], input[type=radio], input[type=button], input[type=submit] {
cursor: pointer;
font-size: 12px;
}
input[text] {
font-size: 12px;
}
/************************************************************
styles below here are not necessarily used in the current
release and the CVS files, they are from earlier versions,
and have been left untouched for anyone needing them in
their own platform ...
*************************************************************/
.topBanner a:link, .topBanner a:active, .topBanner a:visited {
text-decoration:none;
color:white;
}
.topBanner table {
text-decoration:none;
}
.topBanner a:hover {
text-decoration:underline;
}
.topBanner td {
border-top: solid White 1px;
}
.alternativeBgLight {
background-color: #f5f5f5;
}
.alternativeBgDark {
background-color: #e6e6e6
}
.forms {
letter-spacing: normal;
text-align: justify;
text-indent: 3pt;
word-spacing: normal;
padding: 2px 5px;
}
.formsTips {
text-align: justify;
text-indent: 15pt;
word-spacing: normal;
}
/*
input.forms { letter-spacing: normal; text-align: justify; text-indent: 3pt; word-spacing: normal;
padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;}
*/
.warn {
border: thin double Silver;
margin-left: 15px;
margin-right: 15px;
font-family: serif;
color: Red;
padding-left: 25px;
}
.small {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px
}
.xsmall {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px
}
.xxsmall {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 9px
}
/*****************************************************
* DATA TABLE STYLES *
*****************************************************/
.cell_header {
background-color: #EEEEFF;
font-weight:bold;
text-align:left;
padding-left:5px;
} /* header cell in data table in tools */
.data_table {
border-collapse: collapse;
width: 100%;
padding: 5px;
}
.data_table th {
padding-right: 20px;
border: 1px solid gray;
background-color: #E5EDF9;
}
.data_table tr.row_odd {
background-color: #fafafa;
}
.data_table tr.row_odd:hover, .data_table tr.row_even:hover {
background-color: #f0f0f0;
}
.data_table tr.row_even {
background-color: #fff;
}
.data_table td {
padding: 5px;
vertical-align: top;
border-bottom: 1px solid #b0b0b0;
border-right: 1px dotted #e1e1e1;
border-left: 1px dotted #e1e1e1;
}
/* admin page tool list definitions */
.tool_list dt {
font-weight: bold;
}
.tool_list dd {
margin: 0;
padding: 4px 0 0 10px;
}
/* divs for category list / platform news on home page */
.home_cats {
width: 45%;
float: left;
margin: 0;
padding: 0px;
padding-top: 8px;
background: #fff;
}
.home_news {
width: 45%;
float: right;
margin: 0;
padding: 0px;
padding-top: 8px;
background: #fff;
}
label.left {
float: left;
width: 15em;
margin: 0 0 0.5em 0;
}
form br {
clear: both;
}
/* Fix for alignment problem in IE-Win browsers */
/* Hide from IE5-mac. Only IE-win sees this. \*/
* html .label {
margin-right: 10px;
}
* html .data {
height: 1%;
margin-left: 0;
}
/* End hide from IE5/mac */
.radio, .checkbox {
margin: 0;
padding: 0;
border: none;
background-color: transparent;
}
.required {
color: #f00;
font-weight: bold;
}
/* Admin section */
div.admin_section {
width: 40%;
float: left;
padding: 5px;
margin: 10px 20px;
}
div.admin_section h4 {
margin: 0;
border-bottom: 1px solid gray;
width: 100%;
}
.user_course_category {
background-color: #efefef;
border: 1px solid #666;
font-weight: bold;
color: #666;
list-style-type: none;
margin: 5px;
padding: 5px;
}
/* Styles for the Dokeos Config Settings of the platform admin section*/
.sectiontitle {
background-color: #EFEFEF;
border: 1px solid #cccccc;
font-weight: bold;
color: #666666;
list-style-type: none;
margin: 5px;
padding: 5px;
font-size: 11px;
}
.sectioncomment {
color: #000000;
margin: 5px;
padding: 5px;
font-size: 11px;
}
.sectionvalue {
list-style-type: none;
margin: 5px;
padding: 5px;
}
/* New Announcements Tool */
.announcements_datum {
font-size: 12px;
font-weight: italic;
color: #666666;
}
/* System announcements on homepage */
div.system_announcements {
}
div.system_announcements h3 {
}
div.system_announcements ul {
list-style-type: none;
}
div.system_announcement {
margin: 5px;
}
div.system_announcement_title {
}
div.system_announcement_content {
margin-left: 20px;
border-left: 1px solid gray;
padding-left: 5px;
}
/* tips Abbr-plugin for FCKeditor */
abbr {
border-bottom: 1px dotted rgb(102, 102, 102);
background-color:#F00;
cursor: help;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 B

@ -1,17 +1,3 @@
/* items scorm*/
.scorm_item_normal.scorm_completed {
background:url("images/scorm_completed.png") no-repeat left center;
}
.scorm_item_normal.scorm_failed{
background:url("images/scorm_failed.png") no-repeat left center;
}
.scorm_item_normal.scorm_not_attempted{
background:url("images/scorm_not_attempted.png") no-repeat left center;
}
.scorm_item_normal.scorm_highlight{
background:url("images/scorm_highlight.png") no-repeat left center;
}
div.text {
margin-left : 6;
margin-right : 6;

@ -42,6 +42,8 @@ $TBL_TRACK_ATTEMPT = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT)
$TBL_TRACK_ATTEMPT_RECORDING = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING);
$TBL_LP_ITEM_VIEW = Database :: get_course_table(TABLE_LP_ITEM_VIEW);
$allowCoachFeedbackExercises = api_get_setting('allow_coach_feedback_exercises') === 'true';
$course_id = api_get_course_int_id();
$exercise_id = isset($_REQUEST['exerciseId']) ? intval($_REQUEST['exerciseId']) : null;
$filter_user = isset($_REQUEST['filter_by_user']) ? intval($_REQUEST['filter_by_user']) : null;
@ -52,7 +54,7 @@ if (empty($exercise_id)) {
api_not_allowed(true);
}
if (!$is_allowedToEdit) {
if (!$is_allowedToEdit && !$allowCoachFeedbackExercises) {
api_not_allowed(true);
}
@ -123,7 +125,7 @@ if (!empty($_REQUEST['export_report']) && $_REQUEST['export_report'] == '1') {
//Send student email @todo move this code in a class, library
if (isset($_REQUEST['comments']) &&
$_REQUEST['comments'] == 'update' &&
($is_allowedToEdit || $is_tutor)
($is_allowedToEdit || $is_tutor || $allowCoachFeedbackExercises)
) {
//filtered by post-condition
$id = intval($_GET['exeid']);
@ -239,6 +241,14 @@ if (isset($_REQUEST['comments']) &&
$message,
api_get_user_id()
);
if ($allowCoachFeedbackExercises) {
Display::addFlash(
Display::return_message(get_lang('MessageSent'))
);
header('Location: ' . api_get_path(WEB_PATH));
exit;
}
}
//Updating LP score here

@ -64,8 +64,12 @@ if (api_is_course_session_coach(
}
}
$allowCoachFeedbackExercises = api_get_setting('allow_coach_feedback_exercises') === 'true';
$maxEditors = intval(api_get_setting('exercise_max_ckeditors_in_page'));
$is_allowedToEdit = api_is_allowed_to_edit(null, true) || $is_courseTutor || api_is_session_admin() || api_is_drh() || api_is_student_boss();
$isCoachAllowedToEdit = api_is_allowed_to_edit(false, true);
$isFeedbackAllowed = false;
//Getting results from the exe_id. This variable also contain all the information about the exercise
$track_exercise_info = ExerciseLib::get_exercise_track_exercise_info($id);
@ -509,7 +513,21 @@ foreach ($questionList as $questionId) {
$comnt = null;
if ($show_results) {
if ($is_allowedToEdit && $locked == false && !api_is_drh() && !api_is_student_boss()) {
if (
$is_allowedToEdit &&
$locked == false &&
!api_is_drh() &&
!api_is_student_boss() &&
$isCoachAllowedToEdit
) {
$isFeedbackAllowed = true;
} else if (!$isCoachAllowedToEdit && $allowCoachFeedbackExercises) {
$isFeedbackAllowed = true;
}
$marksname = '';
if ($isFeedbackAllowed) {
$name = "fckdiv".$questionId;
$marksname = "marksName".$questionId;
if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
@ -573,7 +591,7 @@ foreach ($questionList as $questionId) {
}
}
if ($is_allowedToEdit) {
if ($is_allowedToEdit && $isFeedbackAllowed) {
if (in_array($answerType, array(FREE_ANSWER, ORAL_EXPRESSION))) {
$marksname = "marksName".$questionId;
echo '<div id="'.$marksname.'" style="display:none">';
@ -708,12 +726,14 @@ echo $total_score_text;
echo $exercise_content;
echo $total_score_text;
if (is_array($arrid) && is_array($arrmarks)) {
$strids = implode(",",$arrid);
$marksid = implode(",",$arrmarks);
if ($isFeedbackAllowed) {
if (is_array($arrid) && is_array($arrmarks)) {
$strids = implode(",",$arrid);
$marksid = implode(",",$arrmarks);
}
}
if ($is_allowedToEdit && $locked == false && !api_is_drh() && !api_is_student_boss()) {
if ($isFeedbackAllowed) {
if (in_array($origin, array('tracking_course','user_course','correct_exercise_in_lp'))) {
echo '<form name="myform" id="myform" action="'.api_get_path(WEB_CODE_PATH).'exercice/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'&filter=2&comments=update&exeid='.$id.'&origin='.$origin.'&details=true&course='.Security::remove_XSS($_GET['cidReq']).$fromlink.'" method="post">';
echo '<input type = "hidden" name="lp_item_id" value="'.$learnpath_id.'">';

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 640 B

Before

Width:  |  Height:  |  Size: 449 B

After

Width:  |  Height:  |  Size: 449 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 360 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

@ -38,5 +38,6 @@ $(document).ready(function() {
$('#learning_path_right_zone iframe').on('load', loadLearningPathRigthZone);
});
});

@ -83,11 +83,11 @@ class PDF
Display::$global_template->assign('pdf_content', $content);
$organization = api_get_setting('Institution');
$img = api_get_path(SYS_CODE_PATH).'css/'.api_get_visual_theme().'/images/header-logo.png';
$img = api_get_path(SYS_CSS_PATH).'themes/'.api_get_visual_theme().'/images/header-logo.png';
// Search for classic logo
if (file_exists($img)) {
$img = api_get_path(WEB_CODE_PATH).'css/'.api_get_visual_theme().'/images/header-logo.png';
$img = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/images/header-logo.png';
$organization = "<img src='$img'>";
} else {
// Just use the platform title.
@ -100,9 +100,9 @@ class PDF
$pdfLogo = api_get_setting('pdf_logo_header');
if ($pdfLogo === 'true') {
$visualTheme = api_get_visual_theme();
$img = api_get_path(SYS_CODE_PATH).'css/'.$visualTheme.'/images/pdf_logo_header.png';
$img = api_get_path(SYS_CSS_PATH).'themes/'.$visualTheme.'/images/pdf_logo_header.png';
if (file_exists($img)) {
$img = api_get_path(WEB_CODE_PATH) . 'css/' . $visualTheme . '/images/pdf_logo_header.png';
$img = api_get_path(WEB_CSS_PATH) . 'themes/' . $visualTheme . '/images/pdf_logo_header.png';
$organization = "<img src='$img'>";
}
}

@ -47,7 +47,7 @@ if (is_array($all_files) && count($all_files) > 0) {
$style = '<style>';
$style .= '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
$style .= '@import "'.api_get_path(WEB_CSS_PATH).api_get_visual_theme().'/default.css";';
$style .= '@import "'.api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/default.css";';
$style .='</style>';
?>

@ -46,7 +46,7 @@ $web_path = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/document/image
$style = '<style>';
$style .= '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
$style .= '@import "'.api_get_path(WEB_CSS_PATH).api_get_visual_theme().'/default.css";';
$style .= '@import "'.api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/default.css";';
$style .='</style>';
?>

@ -31,7 +31,7 @@ if (is_array($scan_files) && count($scan_files) > 0) {
}
$style = '<style>';
$style .= '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
$style .= '@import "'.api_get_path(WEB_CSS_PATH).api_get_visual_theme().'/default.css";';
$style .= '@import "'.api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/default.css";';
$style .='</style>';
?>

@ -313,7 +313,8 @@ VALUES
('chamilo_database_version', NULL, 'textfield', NULL, '0', 'DatabaseVersion', '', NULL, NULL, 0),
('cron_remind_course_finished_activate', NULL, 'radio', 'Crons', 'false', 'CronRemindCourseFinishedActivateTitle', 'CronRemindCourseFinishedActivateComment', NULL, NULL, 1),
('cron_remind_course_expiration_frequency', NULL, 'textfield', 'Crons', '2', 'CronRemindCourseExpirationFrequencyTitle', 'CronRemindCourseExpirationFrequencyComment', NULL, NULL, 1),
('cron_remind_course_expiration_activate', NULL, 'radio', 'Crons', 'false', 'CronRemindCourseExpirationActivateTitle', 'CronRemindCourseExpirationActivateComment', NULL, NULL, 1);
('cron_remind_course_expiration_activate', NULL, 'radio', 'Crons', 'false', 'CronRemindCourseExpirationActivateTitle', 'CronRemindCourseExpirationActivateComment', NULL, NULL, 1),
('allow_coach_feedback_exercises',NULL,'radio','Session','true','AllowCoachFeedbackExercisesTitle','AllowCoachFeedbackExercisesComment',NULL,NULL, 0);
INSERT INTO settings_options (variable, value, display_text)
VALUES
@ -641,7 +642,9 @@ VALUES
('cron_remind_course_finished_activate', 'false', 'No'),
('cron_remind_course_finished_activate', 'true', 'Yes'),
('cron_remind_course_expiration_activate', 'false', 'No'),
('cron_remind_course_expiration_activate', 'true', 'Yes');
('cron_remind_course_expiration_activate', 'true', 'Yes'),
('allow_coach_feedback_exercises','true','Yes'),
('allow_coach_feedback_exercises','false','No');
INSERT INTO language (original_name, english_name, isocode, dokeos_folder, available) VALUES
('&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;','arabic','ar','arabic',0),

@ -7503,4 +7503,4 @@ $ResetPasswordTokenLimitTitle = "Time limit for password reset token";
$ResetPasswordTokenLimitComment = "The number of seconds before the generated token automatically expires and cannot be used anymore (a new token needs to be generated).";
$ViewMyCoursesListBySessionTitle = "View my courses by session";
$ViewMyCoursesListBySessionComment = "Enable an additional 'My courses' page where sessions appear as part of courses, rather than the opposite.";
?>
?>

@ -7514,4 +7514,6 @@ $CronRemindCourseFinishedActivateTitle = "Enviar notificación de finalización
$FieldTypeAlphanumericSpaces = "Texto de caracteres alfanuméricos y espacios";
$CronRemindCourseFinishedActivateComment = "Enviar un correo electrónico a los estudiantes cuando su curso (o sesión) ha finalizado. Esto requiere tareas cron para ser configurado (ver directorio main/cron/).";
$ThanksForRegisteringToSite = "Gracias por registrarse en %s.";
$AllowCoachFeedbackExercisesTitle = "Permitir a los tutores comentar la revisión de ejercicios";
$AllowCoachFeedbackExercisesComment = "Permitir a los tutores editar comentarios durante la revisión de ejercicios";
?>

@ -1432,7 +1432,7 @@ class learnpath
if ($old_prerequisite != $prerequisites) {
$sql = "UPDATE " . $tbl_lp_item . "
SET prerequisite = " . $prerequisites . "
SET prerequisite = '" . $prerequisites . "'
WHERE c_id = ".$course_id." AND id = " . $id;
Database::query($sql);
}
@ -2588,10 +2588,12 @@ class learnpath
*/
public function get_preview_image_path($size = null, $path_type = 'web')
{
$preview_image = $this->get_preview_image();
if (isset($preview_image) && !empty($preview_image)) {
$image_sys_path = api_get_path(SYS_COURSE_PATH).$this->course_info['path'].'/upload/learning_path/images/';
$image_path = api_get_path(WEB_COURSE_PATH).$this->course_info['path'].'/upload/learning_path/images/';
if (isset($size)) {
$info = pathinfo($preview_image);
$image_custom_size = $info['filename'].'.'.$size.'.'.$info['extension'];
@ -3139,7 +3141,7 @@ class learnpath
if (empty($toc_list)) {
$toc_list = $this->get_toc();
}
$html = '<div id="scorm_title" class="scorm-heading">'.Security::remove_XSS($this->get_name()) . '</div>';
//$html = '<div id="scorm_title" class="scorm-heading">'.Security::remove_XSS($this->get_name()) . '</div>';
$html .= '<div class="scorm-body">';
$hide_teacher_icons_lp = isset($_configuration['hide_teacher_icons_lp']) ? $_configuration['hide_teacher_icons_lp'] : true;
@ -3155,6 +3157,7 @@ class learnpath
$html .= '</div>';
}
}
$html .= '<div id="inner_lp_toc" class="inner_lp_toc">';
require_once 'resourcelinker.inc.php';
@ -3187,11 +3190,11 @@ class learnpath
'browsed' => 'scorm_completed',
);
$scorm_color_background = 'scorm_item_2';
$scorm_color_background = 'row_odd';
$style_item = '';
if ($color_counter % 2 == 0) {
$scorm_color_background = 'scorm_item_1';
$scorm_color_background = 'row_even';
}
$dirTypes = self::getChapterTypes();
@ -3201,7 +3204,7 @@ class learnpath
$style_item = '';
}
if ($item['id'] == $this->current) {
$scorm_color_background = 'scorm_item_normal scorm_highlight '.$scorm_color_background.' ';
$scorm_color_background = 'scorm_item_normal '.$scorm_color_background.' scorm_highlight';
} elseif (!in_array($item['type'], $dirTypes)) {
$scorm_color_background = 'scorm_item_normal '.$scorm_color_background.' ';
}

@ -391,7 +391,7 @@ if (api_get_course_setting('lp_return_link') == 1) {
$buttonHomeText = get_lang('LearningPathList');
}
$lpPreviewImagePath = 'unknown_250_100.jpg';
$lpPreviewImagePath = 'unknown.png';
if ($_SESSION['oLP']->get_preview_image()) {
$lpPreviewImagePath = $_SESSION['oLP']->get_preview_image_path();
@ -435,14 +435,17 @@ if ($gamificationMode == 1) {
$template->assign(
'lp_preview_image',
Display::return_icon(
Display::img(
$lpPreviewImagePath,
null,
['height' => 96, 'width' => 104]
$_SESSION['oLP']->name,
array('class' => 'img-circle'),
ICON_SIZE_BIG
)
);
$template->assign('lp_author', $_SESSION['oLP']->get_author());
$template->assign('lp_mode', $_SESSION['oLP']->mode);
$template->assign('lp_title_scorm',$_SESSION['oLP']->name);
$template->assign(
'lp_html_toc',
$_SESSION['oLP']->get_html_toc($get_toc_list)

@ -46,34 +46,47 @@
</div>
{# Author image preview #}
<div id="panel-scorm" class="panel-body">
<a href="{{ button_home_url }}" class="btn btn-success btn-block" target="_self" onclick="javascript: window.parent.API.save_asset();">
<a href="{{ button_home_url }}" class="btn btn-primary btn-block" target="_self" onclick="javascript: window.parent.API.save_asset();">
<i class="fa fa-home"></i> {{ button_home_text }}
</a>
<div class="image-avatar">{{ lp_preview_image }}</div>
<div class="image-avatar">
<div class="row">
{% if lp_author == '' %}
<div class="col-md-12">
{{ lp_preview_image }}
</div>
{% else %}
<div class="col-md-4">
{{ lp_preview_image }}
</div>
<div class="col-md-8">
<div class="description-autor"> {{ lp_author }} </div>
</div>
{% endif %}
</div>
</div>
<div id="progress_bar">
{{ progress_bar }}
</div>
<div id="lp_navigation_elem" class="navegation-bar">
{{ navigation_bar }}
<div id="progress_bar">
{{ progress_bar }}
</div>
</div>
<div class="description-autor">{{ lp_author }}</div>
{% if show_audio_player %}
<div id="lp_media_file">
{{ media_player }}
</div>
{% endif %}
</div>
</div>
</div>
{% endif %}
{# TOC layout #}
<div id="toc_id" name="toc_name">
<div id="learning_path_toc" class="scorm-list">{{ lp_html_toc }}</div>
<div id="toc_id" class="scorm-body" name="toc_name">
<div class="scorm-title"> <i class="fa fa-book"></i> {{ lp_title_scorm }}</div>
<div id="learning_path_toc" class="scorm-list">
{{ lp_html_toc }}
</div>
</div>
{# end TOC layout #}
@ -87,7 +100,7 @@
{% if lp_mode == 'fullscreen' %}
<iframe id="content_id_blank" name="content_name_blank" src="blank.php" border="0" frameborder="0" style="width: 100%; height: 100%" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe>
{% else %}
<iframe id="content_id" name="content_name" src="{{ iframe_src }}" border="0" frameborder="0" style="display: block; width: 100%; height: 100%" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe>
<iframe id="content_id" name="content_name" src="{{ iframe_src }}" border="0" frameborder="0" style="display: block; width: 100%; height: 100%" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe>
{% endif %}
</div>
{# end right Zone #}
@ -160,7 +173,7 @@
{% endif %}
{% endif %}
};
$(document).ready(function() {
updateContentHeight();
@ -171,8 +184,11 @@
$(window).resize(function() {
updateContentHeight();
});
});
window.onload = updateContentHeight();
window.onresize = updateContentHeight();
@ -194,4 +210,5 @@
});
});
});
</script>

@ -38,8 +38,18 @@ class CkEditor extends Editor
*/
public function createHtml()
{
$style = '';
if (trim($this->value) == '<html><head><title></title></head><body></body></html>') {
$cssFile = api_get_path(SYS_CSS_PATH).'themes/'.api_get_visual_theme().'/frames.css';
if (!is_file($cssFile)) {
$cssFile = api_get_path(WEB_CSS_PATH).'frames.css';
} else {
$cssFile = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/frames.css';
}
$style = '<link href="'.$cssFile.'" rel="stylesheet" media="screen" type="text/css" />';
}
$html = '<textarea id="'.$this->getName().'" name="'.$this->getName().'" class="ckeditor">
'.$this->value.'
'.$style.$this->value.'
</textarea>';
$html .= $this->editorReplace();

Loading…
Cancel
Save