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

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Browse Source
ofaj
jmontoya 10 years ago
parent c3e8aab460 32268382f1
commit 742b52a940
6 changed files with 84 additions and 37 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. 1
      app/Migrations/Schema/V110/Version20151101082300.php
  2. 53
      app/Resources/public/css/base.css
  3. 2
      main/exercice/exercise.class.php
  4. BIN
      main/img/clock-exercise.png
  5. 57
      main/inc/lib/add_course.lib.inc.php
  6. 6
      main/template/default/layout/header.js.tpl

1
app/Migrations/Schema/V110/Version20151101082300.php
Unescape View File

@ -252,7 +252,6 @@ class Version20151101082300 extends AbstractMigrationChamilo
$sessionRelUser->addColumn('moved_to', Type::INTEGER)->setNotnull(false); $sessionRelUser->addColumn('moved_to', Type::INTEGER)->setNotnull(false);
$sessionRelUser->addColumn('moved_status', Type::INTEGER)->setNotnull(false); $sessionRelUser->addColumn('moved_status', Type::INTEGER)->setNotnull(false);
$sessionRelUser->addColumn('moved_at', Type::DATETIME)->setNotnull(false); $sessionRelUser->addColumn('moved_at', Type::DATETIME)->setNotnull(false);
$sessionRelUser->addColumn('duration', Type::INTEGER)->setNotnull(false);
$sessionRelUser->addIndex(['session_id']); $sessionRelUser->addIndex(['session_id']);
$sessionRelUser->addIndex(['user_id']); $sessionRelUser->addIndex(['user_id']);

53
app/Resources/public/css/base.css
Unescape View File

@ -2048,7 +2048,6 @@ div.admin_section h4 {
float: left; float: left;
} }
.ribbon .rib-success, .ribbon .ribbon-total-success{ .ribbon .rib-success, .ribbon .ribbon-total-success{
background-color: #768E00; background-color: #768E00;
background-image: -ms-linear-gradient(top, #9CB80A, #768E00); background-image: -ms-linear-gradient(top, #9CB80A, #768E00);
@ -2111,11 +2110,6 @@ div.admin_section h4 {
.ribbon .rib::before {left: 0;} .ribbon .rib::before {left: 0;}
.ribbon .rib::after {right: 0;} .ribbon .rib::after {right: 0;}
.ribbon .success {
}
.ribbon .error { .ribbon .error {
color: red; color: red;
} }
@ -2134,28 +2128,30 @@ div.admin_section h4 {
.exercise_save_now_button, .exercise_button{ .exercise_save_now_button, .exercise_button{
/* padding:5px; */ /* padding:5px; */
} }
.time_container_warning {
background-color:#FFD700;
border:1px solid #B8860B;
}
/* Exercise clock*/ /* Exercise clock*/
.count_down { .count_down {
padding: 3px; padding: 3px;
font-size:22px; font-size:20px;
font-weight:bold; font-weight:bold;
color:#222; color:#2E75A3;
padding: 12px; padding: 5px;
text-align: center; text-align: center;
width:200px; margin-bottom: 10px;
background: url(../../main/img/clock-exercise.png) no-repeat center center #FFF;
border: 1px solid #DDD;
border-radius: 5px;
}
.count_down.navbar-fixed-top{
border-radius: 0px;
}
.time_container_warning {
background: url(../../main/img/clock-exercise.png) no-repeat center center #FFD700;
border:1px solid #B8860B;
} }
.red_alert { .red_alert {
color:red; color:red;
font-weight: bold; font-weight: bold;
} }
#question_feedback { #question_feedback {
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
-moz-border-radius: 10px; -moz-border-radius: 10px;
@ -2170,7 +2166,6 @@ div.admin_section h4 {
margin-top:5px; margin-top:5px;
padding:5px; padding:5px;
} }
.userportal-order-courses-link { .userportal-order-courses-link {
background-color: #F9F9F9; background-color: #F9F9F9;
border-radius: 10px 10px 10px 10px; border-radius: 10px 10px 10px 10px;
@ -3267,6 +3262,24 @@ a.forum_group_link {
.subnav .nav > li > .logout { .subnav .nav > li > .logout {
padding-top:8px; padding-top:8px;
} }
.subnav-fixed {
position: fixed;
top: 0px;
left: 0;
right: 0;
z-index: 1030;
border-color: #d5d5d5;
border-width: 0 0 1px; /* drop the border on the fixed edges */
-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 { .doc_folder {
margin-right:5px; margin-right:5px;
margin-top:5px; margin-top:5px;
@ -5028,7 +5041,7 @@ div#chat-remote-video video {
width: 450px !important; width: 450px !important;
} }
.ui-accordion .ui-accordion-content-active{ .ui-accordion .ui-accordion-content-active{
overflow: visible;
} }
.ui-jqgrid-view .ui-widget-content a{ .ui-jqgrid-view .ui-widget-content a{
color:#666666; color:#666666;

2
main/exercice/exercise.class.php
Unescape View File

@ -5017,7 +5017,7 @@ class Exercise
'<span id="counter_to_redirect" class="red_alert"></span>' '<span id="counter_to_redirect" class="red_alert"></span>'
); );
$html .= '</div>'; $html .= '</div>';
$html .= '<div id="exercise_clock_warning" class="well count_down"></div>'; $html .= '<div id="exercise_clock_warning" class="count_down"></div>';
return $html; return $html;
} }

BIN
main/img/clock-exercise.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

57
main/inc/lib/add_course.lib.inc.php
Unescape View File

@ -875,9 +875,21 @@ class AddCourse
); );
$image_id = Database:: insert_id(); $image_id = Database:: insert_id();
Database::query( Database::insert(
"INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) $TABLEITEMPROPERTY,
VALUES ($course_id,'document',1,'$now','$now',$image_id,'DocumentAdded',1,NULL,NULL,0)" [
'c_id' => $course_id,
'tool' => 'document',
'insert_user_id' => api_get_user_id(),
'insert_date' => $now,
'lastedit_date' => $now,
'ref' => $image_id,
'lastedit_type' => 'DocumentAdded',
'lastedit_user_id' => api_get_user_id(),
'to_group_id' => null,
'to_user_id' => null,
'visibility' => 0
]
); );
} }
} }
@ -921,11 +933,22 @@ class AddCourse
if ($path_documents . $value['file'] == '/certificates/default.html') { if ($path_documents . $value['file'] == '/certificates/default.html') {
$example_cert_id = $image_id; $example_cert_id = $image_id;
} }
Database::query( $docId = Database::insert(
"INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) $TABLEITEMPROPERTY,
VALUES ($course_id,'document',1,'$now','$now',$image_id,'DocumentAdded',1,NULL,NULL,1)" [
'c_id' => $course_id,
'tool' => 'document',
'insert_user_id' => api_get_user_id(),
'insert_date' => $now,
'lastedit_date' => $now,
'ref' => $image_id,
'lastedit_type' => 'DocumentAdded',
'lastedit_user_id' => api_get_user_id(),
'to_group_id' => null,
'to_user_id' => null,
'visibility' => 1
]
); );
$docId = Database:: insert_id();
if ($docId) { if ($docId) {
$sql = "UPDATE $TABLEITEMPROPERTY SET id = iid WHERE iid = $docId"; $sql = "UPDATE $TABLEITEMPROPERTY SET id = iid WHERE iid = $docId";
Database::query($sql); Database::query($sql);
@ -1146,11 +1169,23 @@ class AddCourse
$sql = "UPDATE $tableDocument SET id = iid WHERE iid = $docId"; $sql = "UPDATE $tableDocument SET id = iid WHERE iid = $docId";
Database::query($sql); Database::query($sql);
Database::query( $id = Database::insert(
"INSERT INTO $tableItem (id, c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) $tableItem,
VALUES ($counter, $course_id,'document',1,'$now', '$now', $docId, 'DocumentAdded', 1, NULL, NULL, 0)" [
'id' => $counter,
'c_id' => $course_id,
'tool' => 'document',
'insert_user_id' => api_get_user_id(),
'insert_date' => $now,
'lastedit_date' => $now,
'ref' => $docId,
'lastedit_type' => 'DocumentAdded',
'lastedit_user_id' => api_get_user_id(),
'to_group_id' => null,
'to_user_id' => null,
'visibility' => 0
]
); );
$id = Database:: insert_id();
if ($id) { if ($id) {
$sql = "UPDATE $tableItem SET id = iid WHERE iid = $id"; $sql = "UPDATE $tableItem SET id = iid WHERE iid = $id";
Database::query($sql); Database::query($sql);

6
main/template/default/layout/header.js.tpl
Unescape View File

@ -232,11 +232,11 @@ $(document).scroll(function() {
} }
if (fixed.attr('data-top') - fixed.outerHeight() <= $(this).scrollTop()) { if (fixed.attr('data-top') - fixed.outerHeight() <= $(this).scrollTop()) {
fixed.addClass('subnav-fixed'); fixed.addClass('navbar-fixed-top');
fixed.css('width', '100%'); fixed.css('width', '100%');
} else { } else {
fixed.removeClass('subnav-fixed'); fixed.removeClass('navbar-fixed-top');
fixed.css('width', '200px'); fixed.css('width', '100%');
} }
} }

Write Preview
Loading…
Cancel
Save