Gitlab CSE Unil

Commit fd9cbabb authored by M. Chardon's avatar M. Chardon
Browse files

maj par rapport à editpdf

parent ae833d60
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
......@@ -86,8 +87,11 @@ if ($action === 'pollconversions') {
if (in_array($response->status, $readystatuslist)) {
$combineddocument = document_services::get_combined_pdf_for_attempt($assignment, $userid, $attemptnumber);
$response->pagecount = $combineddocument->get_page_count();
} else if (in_array($response->status, $completestatuslist)) {
$response->status = $combineddocument->get_status();
$response->filecount = $combineddocument->get_document_count();
}
if (in_array($response->status, $completestatuslist)) {
$pages = document_services::get_page_images_for_attempt($assignment, $userid, $attemptnumber, $readonly);
$response->pagecount = $combineddocument->get_page_count();
......
......@@ -260,37 +260,8 @@ ul.assignfeedback_editpdfplus_menu {
background-image: radial-gradient(ellipse at center, #fff 60%, #dfdfdf 100%);
}
.assignfeedback_editpdfplus_widget .commentdrawable img {
padding: 1px;
}
.assignfeedback_editpdfplus_widget .commentdrawable a {
float: right;
position: relative;
left: -17px;
top: 2px;
height: 14px;
background-color: white;
border-left: 1px solid #ccc;
border-bottom: 1px solid #ccc;
line-height: 14px;
}
.assignfeedback_editpdfplus_widget .commentdrawable textarea {
padding: 4px;
padding-right: 20px;
resize: none;
overflow: hidden;
color: black;
border: 2px solid #ccc;
border-radius: 4px;
font-size: 16px;
font-family: helvetica;
min-height: 1.2em;
}
.assignfeedback_editpdfplus_widget .commentdrawable {
display: inline-block;
.assignfeedback_editpdfplus_widget .deleteannotationbutton {
z-index: 51;
}
.assignfeedback_editpdfplus_widget .drawingcanvas .loading .progressbarlabel {
......
......@@ -941,7 +941,6 @@ Y.extend(ANNOTATION, Y.Base, {
deletelink.append(deleteicon);
drawingregion.append(deletelink);
deletelink.setData('annotation', this);
deletelink.setStyle('zIndex', '200');
deletelink.on('click', this.remove, this);
deletelink.on('key', this.remove, 'space,enter', this);
deletelink.setX(offsetcanvas[0] + bounds.x + bounds.width - 18);
......@@ -5431,7 +5430,7 @@ EDITOR.prototype = {
* @method open_in_panel
*/
open_in_panel: function (panel) {
var drawingcanvas, drawingregion;
var drawingcanvas;
this.panel = panel;
panel.append(this.get('body'));
......@@ -5442,9 +5441,6 @@ EDITOR.prototype = {
drawingcanvas = this.get_dialogue_element(SELECTOR.DRAWINGCANVAS);
this.graphic = new Y.Graphic({render: drawingcanvas});
drawingregion = this.get_dialogue_element(SELECTOR.DRAWINGREGION);
drawingregion.on('scroll', this.move_canvas, this);
if (!this.get('readonly')) {
drawingcanvas.on('gesturemovestart', this.edit_start, null, this);
drawingcanvas.on('gesturemove', this.edit_move, null, this);
......
......@@ -941,7 +941,6 @@ Y.extend(ANNOTATION, Y.Base, {
deletelink.append(deleteicon);
drawingregion.append(deletelink);
deletelink.setData('annotation', this);
deletelink.setStyle('zIndex', '200');
deletelink.on('click', this.remove, this);
deletelink.on('key', this.remove, 'space,enter', this);
deletelink.setX(offsetcanvas[0] + bounds.x + bounds.width - 18);
......@@ -5431,7 +5430,7 @@ EDITOR.prototype = {
* @method open_in_panel
*/
open_in_panel: function (panel) {
var drawingcanvas, drawingregion;
var drawingcanvas;
this.panel = panel;
panel.append(this.get('body'));
......@@ -5442,9 +5441,6 @@ EDITOR.prototype = {
drawingcanvas = this.get_dialogue_element(SELECTOR.DRAWINGCANVAS);
this.graphic = new Y.Graphic({render: drawingcanvas});
drawingregion = this.get_dialogue_element(SELECTOR.DRAWINGREGION);
drawingregion.on('scroll', this.move_canvas, this);
if (!this.get('readonly')) {
drawingcanvas.on('gesturemovestart', this.edit_start, null, this);
drawingcanvas.on('gesturemove', this.edit_move, null, this);
......
......@@ -409,7 +409,6 @@ Y.extend(ANNOTATION, Y.Base, {
deletelink.append(deleteicon);
drawingregion.append(deletelink);
deletelink.setData('annotation', this);
deletelink.setStyle('zIndex', '200');
deletelink.on('click', this.remove, this);
deletelink.on('key', this.remove, 'space,enter', this);
deletelink.setX(offsetcanvas[0] + bounds.x + bounds.width - 18);
......
......@@ -364,7 +364,7 @@ EDITOR.prototype = {
* @method open_in_panel
*/
open_in_panel: function (panel) {
var drawingcanvas, drawingregion;
var drawingcanvas;
this.panel = panel;
panel.append(this.get('body'));
......@@ -375,9 +375,6 @@ EDITOR.prototype = {
drawingcanvas = this.get_dialogue_element(SELECTOR.DRAWINGCANVAS);
this.graphic = new Y.Graphic({render: drawingcanvas});
drawingregion = this.get_dialogue_element(SELECTOR.DRAWINGREGION);
drawingregion.on('scroll', this.move_canvas, this);
if (!this.get('readonly')) {
drawingcanvas.on('gesturemovestart', this.edit_start, null, this);
drawingcanvas.on('gesturemove', this.edit_move, null, this);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment