Gitlab CSE Unil

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

modif palette de couleur par défaut, et épaisseur du trait par défaut

parent 0591b597
...@@ -293,6 +293,7 @@ class assignfeedback_editpdfplus_renderer extends plugin_renderer_base { ...@@ -293,6 +293,7 @@ class assignfeedback_editpdfplus_renderer extends plugin_renderer_base {
$this->page->requires->strings_for_js(array( $this->page->requires->strings_for_js(array(
'yellow', 'yellow',
'yellowlemon',
'white', 'white',
'red', 'red',
'blue', 'blue',
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<FIELD NAME="endy" TYPE="int" LENGTH="10" NOTNULL="false" DEFAULT="0" SEQUENCE="false" COMMENT="y-position of the end of the annotation"/> <FIELD NAME="endy" TYPE="int" LENGTH="10" NOTNULL="false" DEFAULT="0" SEQUENCE="false" COMMENT="y-position of the end of the annotation"/>
<FIELD NAME="path" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="SVG path describing the freehand line"/> <FIELD NAME="path" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="SVG path describing the freehand line"/>
<FIELD NAME="toolid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/> <FIELD NAME="toolid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
<FIELD NAME="colour" TYPE="char" LENGTH="10" NOTNULL="false" DEFAULT="black" SEQUENCE="false" COMMENT="Can be red, yellow, green, blue, white, black"/> <FIELD NAME="colour" TYPE="char" LENGTH="15" NOTNULL="false" DEFAULT="black" SEQUENCE="false" COMMENT="Can be red, yellow, green, blue, white, black"/>
<FIELD NAME="draft" TYPE="int" LENGTH="2" NOTNULL="true" DEFAULT="1" SEQUENCE="false" COMMENT="Is this a draft annotation?"/> <FIELD NAME="draft" TYPE="int" LENGTH="2" NOTNULL="true" DEFAULT="1" SEQUENCE="false" COMMENT="Is this a draft annotation?"/>
<FIELD NAME="answerrequested" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/> <FIELD NAME="answerrequested" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
<FIELD NAME="studentanswer" TYPE="char" LENGTH="500" NOTNULL="false" SEQUENCE="false"/> <FIELD NAME="studentanswer" TYPE="char" LENGTH="500" NOTNULL="false" SEQUENCE="false"/>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
viewBox="-2.5 0 16 16"
preserveAspectRatio="xMinYMid meet"
overflow="visible"
id="svg2"
version="1.1"
inkscape:version="0.91 r"
sodipodi:docname="colour_yellowlemon.svg"
inkscape:export-filename="/var/www/html/moodle/mod/assign/feedback/editpdfplus/pix/colour_yellowlemon.png"
inkscape:export-xdpi="89.462296"
inkscape:export-ydpi="89.462296">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8">
<linearGradient
id="linearGradient5609"
osb:paint="solid">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop5611" />
</linearGradient>
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1056"
inkscape:window-height="1045"
id="namedview6"
showgrid="false"
inkscape:zoom="22.627417"
inkscape:cx="7.6364731"
inkscape:cy="1.5513533"
inkscape:window-x="859"
inkscape:window-y="2"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<path
d="m 5.1830573,0.54683122 c 0,0 -5.20201968,6.62075228 -5.20201968,9.93112878 0,2.837465 2.36455438,5.202019 5.20201968,5.202019 2.8374652,0 5.2020197,-2.364554 5.2020197,-5.202019 0,-3.3103765 -5.2020197,-9.93112878 -5.2020197,-9.93112878 z M 3.953489,12.937096 c -0.6620752,0 -1.1349861,-0.472911 -1.1349861,-1.134986 0,-0.756657 1.1349861,-2.17539 1.1349861,-2.17539 0,0 1.1349861,1.513315 1.1349861,2.17539 0,0.662075 -0.4729109,1.134986 -1.1349861,1.134986 z"
id="path4"
style="fill:#ffff00;stroke:#999999;stroke-width:0.66207522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:export-xdpi="600"
inkscape:export-ydpi="600"
inkscape:connector-curvature="0" />
<path
style="fill:#999999;fill-opacity:1;stroke:#ffff00;stroke-width:0.492;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 3.3393001,13.043311 C 2.5834358,12.68153 2.3631566,11.982848 2.7331201,11.120631 2.9156057,10.695343 3.5306805,9.7103304 3.8261953,9.3701274 l 0.1803984,-0.207679 0.4163499,0.6327338 c 1.0055137,1.5280928 1.1830315,2.1232218 0.8139671,2.7288228 -0.333759,0.547667 -1.2910284,0.809637 -1.8976109,0.519306 z"
id="path5637"
inkscape:connector-curvature="0" />
</svg>
...@@ -55,6 +55,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)', ...@@ -55,6 +55,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)',
COMMENTTEXTCOLOUR = 'rgb(51, 51, 51)', COMMENTTEXTCOLOUR = 'rgb(51, 51, 51)',
COMMENTCOLOUR = { COMMENTCOLOUR = {
'white': 'rgb(255,255,255)', 'white': 'rgb(255,255,255)',
'yellowlemon': 'rgb(255,255,0)',
'yellow': 'rgb(255,236,174)', 'yellow': 'rgb(255,236,174)',
'red': 'rgb(249,181,179)', 'red': 'rgb(249,181,179)',
'green': 'rgb(214,234,178)', 'green': 'rgb(214,234,178)',
...@@ -63,6 +64,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)', ...@@ -63,6 +64,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)',
}, },
ANNOTATIONCOLOUR = { ANNOTATIONCOLOUR = {
'white': 'rgb(255,255,255)', 'white': 'rgb(255,255,255)',
'yellowlemon': 'rgb(255,255,0)',
'yellow': 'rgb(255,207,53)', 'yellow': 'rgb(255,207,53)',
'red': 'rgb(239,69,64)', 'red': 'rgb(239,69,64)',
'green': 'rgb(152,202,62)', 'green': 'rgb(152,202,62)',
...@@ -107,7 +109,7 @@ TOOLTYPELIB = { ...@@ -107,7 +109,7 @@ TOOLTYPELIB = {
'OVAL': 'oval', 'OVAL': 'oval',
'HIGHLIGHT': 'highlight' 'HIGHLIGHT': 'highlight'
}, },
STROKEWEIGHT = 4;// This file is part of Moodle - http://moodle.org/ STROKEWEIGHT = 2;// This file is part of Moodle - http://moodle.org/
// //
// Moodle is free software: you can redistribute it and/or modify // Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
......
...@@ -55,6 +55,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)', ...@@ -55,6 +55,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)',
COMMENTTEXTCOLOUR = 'rgb(51, 51, 51)', COMMENTTEXTCOLOUR = 'rgb(51, 51, 51)',
COMMENTCOLOUR = { COMMENTCOLOUR = {
'white': 'rgb(255,255,255)', 'white': 'rgb(255,255,255)',
'yellowlemon': 'rgb(255,255,0)',
'yellow': 'rgb(255,236,174)', 'yellow': 'rgb(255,236,174)',
'red': 'rgb(249,181,179)', 'red': 'rgb(249,181,179)',
'green': 'rgb(214,234,178)', 'green': 'rgb(214,234,178)',
...@@ -63,6 +64,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)', ...@@ -63,6 +64,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)',
}, },
ANNOTATIONCOLOUR = { ANNOTATIONCOLOUR = {
'white': 'rgb(255,255,255)', 'white': 'rgb(255,255,255)',
'yellowlemon': 'rgb(255,255,0)',
'yellow': 'rgb(255,207,53)', 'yellow': 'rgb(255,207,53)',
'red': 'rgb(239,69,64)', 'red': 'rgb(239,69,64)',
'green': 'rgb(152,202,62)', 'green': 'rgb(152,202,62)',
...@@ -107,7 +109,7 @@ TOOLTYPELIB = { ...@@ -107,7 +109,7 @@ TOOLTYPELIB = {
'OVAL': 'oval', 'OVAL': 'oval',
'HIGHLIGHT': 'highlight' 'HIGHLIGHT': 'highlight'
}, },
STROKEWEIGHT = 4;// This file is part of Moodle - http://moodle.org/ STROKEWEIGHT = 2;// This file is part of Moodle - http://moodle.org/
// //
// Moodle is free software: you can redistribute it and/or modify // Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
......
...@@ -53,6 +53,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)', ...@@ -53,6 +53,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)',
COMMENTTEXTCOLOUR = 'rgb(51, 51, 51)', COMMENTTEXTCOLOUR = 'rgb(51, 51, 51)',
COMMENTCOLOUR = { COMMENTCOLOUR = {
'white': 'rgb(255,255,255)', 'white': 'rgb(255,255,255)',
'yellowlemon': 'rgb(255,255,0)',
'yellow': 'rgb(255,236,174)', 'yellow': 'rgb(255,236,174)',
'red': 'rgb(249,181,179)', 'red': 'rgb(249,181,179)',
'green': 'rgb(214,234,178)', 'green': 'rgb(214,234,178)',
...@@ -61,6 +62,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)', ...@@ -61,6 +62,7 @@ SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)',
}, },
ANNOTATIONCOLOUR = { ANNOTATIONCOLOUR = {
'white': 'rgb(255,255,255)', 'white': 'rgb(255,255,255)',
'yellowlemon': 'rgb(255,255,0)',
'yellow': 'rgb(255,207,53)', 'yellow': 'rgb(255,207,53)',
'red': 'rgb(239,69,64)', 'red': 'rgb(239,69,64)',
'green': 'rgb(152,202,62)', 'green': 'rgb(152,202,62)',
...@@ -105,4 +107,4 @@ TOOLTYPELIB = { ...@@ -105,4 +107,4 @@ TOOLTYPELIB = {
'OVAL': 'oval', 'OVAL': 'oval',
'HIGHLIGHT': 'highlight' 'HIGHLIGHT': 'highlight'
}, },
STROKEWEIGHT = 4; STROKEWEIGHT = 2;
\ No newline at end of file \ No newline at end of file
Supports Markdown
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