MDL-42402 EditPDF: Make the colours match the mockup in MDL-41633

This commit is contained in:
Damyon Wiese 2013-11-05 14:49:06 +08:00
parent 057a79922e
commit 1d38083c9d
23 changed files with 484 additions and 156 deletions

View File

@ -210,21 +210,22 @@ class pdf extends \FPDI {
if (!$this->filename) {
return false;
}
$this->SetDrawColor(51, 51, 51);
switch ($colour) {
case 'red':
$this->SetFillColor(255, 176, 176);
$this->SetFillColor(249, 181, 179);
break;
case 'green':
$this->SetFillColor(176, 255, 176);
$this->SetFillColor(214, 234, 178);
break;
case 'blue':
$this->SetFillColor(208, 208, 255);
$this->SetFillColor(203, 217, 237);
break;
case 'white':
$this->SetFillColor(255, 255, 255);
break;
default: /* Yellow */
$this->SetFillColor(255, 255, 176);
$this->SetFillColor(255, 236, 174);
break;
}
@ -266,23 +267,23 @@ class pdf extends \FPDI {
}
switch ($colour) {
case 'yellow':
$colourarray = array(255, 255, 0);
$colourarray = array(255, 207, 53);
break;
case 'green':
$colourarray = array(0, 255, 0);
$colourarray = array(153, 202, 62);
break;
case 'blue':
$colourarray = array(0, 0, 255);
$colourarray = array(125, 159, 211);
break;
case 'white':
$colourarray = array(255, 255, 255);
break;
case 'black':
$colourarray = array(0, 0, 0);
$colourarray = array(51, 51, 51);
break;
default: /* Red */
$colour = 'red';
$colourarray = array(255, 0, 0);
$colourarray = array(239, 69, 64);
break;
}
$this->SetDrawColorArray($colourarray);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

After

Width:  |  Height:  |  Size: 182 B

View File

@ -1,13 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve" preserveAspectRatio="xMinYMid meet">
<defs>
</defs>
<path style="fill:#7D9FD3;" d="M16,15c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V1c0-0.5,0.5-1,1-1h14c0.5,0,1,0.5,1,1V15z"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<svg
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"
version="1.1"
x="0px"
y="0px"
width="16px"
height="16px"
viewBox="0 0 16 16"
style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve"
preserveAspectRatio="xMinYMid meet"
id="svg2"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="background_colour_blue.svg"><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" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="753"
inkscape:window-height="480"
id="namedview8"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="663"
inkscape:window-y="258"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
id="defs4">
</defs>
<path
style="fill:#cbd9ed;fill-opacity:1"
d="M16,15c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V1c0-0.5,0.5-1,1-1h14c0.5,0,1,0.5,1,1V15z"
id="path6" />
</svg>

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

After

Width:  |  Height:  |  Size: 185 B

View File

@ -1,13 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve" preserveAspectRatio="xMinYMid meet">
<defs>
</defs>
<path style="fill:#99CA3E;" d="M16,15c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V1c0-0.5,0.5-1,1-1h14c0.5,0,1,0.5,1,1V15z"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<svg
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"
version="1.1"
x="0px"
y="0px"
width="16px"
height="16px"
viewBox="0 0 16 16"
style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve"
preserveAspectRatio="xMinYMid meet"
id="svg2"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="background_colour_green.svg"><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" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="753"
inkscape:window-height="480"
id="namedview8"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
id="defs4">
</defs>
<path
style="fill:#d6eab2;fill-opacity:1"
d="M16,15c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V1c0-0.5,0.5-1,1-1h14c0.5,0,1,0.5,1,1V15z"
id="path6" />
</svg>

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

After

Width:  |  Height:  |  Size: 182 B

View File

@ -1,13 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve" preserveAspectRatio="xMinYMid meet">
<defs>
</defs>
<path style="fill:#EF4540;" d="M16,15c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V1c0-0.5,0.5-1,1-1h14c0.5,0,1,0.5,1,1V15z"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<svg
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"
version="1.1"
x="0px"
y="0px"
width="16px"
height="16px"
viewBox="0 0 16 16"
style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve"
preserveAspectRatio="xMinYMid meet"
id="svg2"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="background_colour_red.svg"><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" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="753"
inkscape:window-height="480"
id="namedview8"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
id="defs4">
</defs>
<path
style="fill:#f9b5b3;fill-opacity:1"
d="M16,15c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V1c0-0.5,0.5-1,1-1h14c0.5,0,1,0.5,1,1V15z"
id="path6" />
</svg>

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

After

Width:  |  Height:  |  Size: 182 B

View File

@ -1,13 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve" preserveAspectRatio="xMinYMid meet">
<defs>
</defs>
<path style="fill:#FFCF35;" d="M16,15c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V1c0-0.5,0.5-1,1-1h14c0.5,0,1,0.5,1,1V15z"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<svg
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"
version="1.1"
x="0px"
y="0px"
width="16px"
height="16px"
viewBox="0 0 16 16"
style="overflow:visible;enable-background:new 0 0 16 16;"
xml:space="preserve"
preserveAspectRatio="xMinYMid meet"
id="svg2"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="background_colour_yellow.svg"><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" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="753"
inkscape:window-height="480"
id="namedview8"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
id="defs4">
</defs>
<path
style="fill:#ffecae;fill-opacity:1"
d="M16,15c0,0.5-0.5,1-1,1H1c-0.5,0-1-0.5-1-1V1c0-0.5,0.5-1,1-1h14c0.5,0,1,0.5,1,1V15z"
id="path6" />
</svg>

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 477 B

View File

@ -1,14 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="-2.5 0 16 16" style="overflow:visible;enable-background:new -2.5 0 16 16;"
xml:space="preserve" preserveAspectRatio="xMinYMid meet">
<defs>
</defs>
<path style="fill:#7D9ED3;" d="M5.5,0C5.5,0,0,7,0,10.5c0,3,2.5,5.5,5.5,5.5s5.5-2.5,5.5-5.5C11,7,5.5,0,5.5,0z M4.2,13.1
c-0.7,0-1.2-0.5-1.2-1.2c0-0.8,1.2-2.3,1.2-2.3s1.2,1.6,1.2,2.3C5.4,12.6,4.9,13.1,4.2,13.1z"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<svg
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"
version="1.1"
x="0px"
y="0px"
width="16px"
height="16px"
viewBox="-2.5 0 16 16"
style="overflow:visible;enable-background:new -2.5 0 16 16;"
xml:space="preserve"
preserveAspectRatio="xMinYMid meet"
id="svg2"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="colour_blue.svg"><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" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="958"
inkscape:window-height="531"
id="namedview8"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
id="defs4">
</defs>
<path
style="fill:#7d9fd3;fill-opacity:1"
d="M5.5,0C5.5,0,0,7,0,10.5c0,3,2.5,5.5,5.5,5.5s5.5-2.5,5.5-5.5C11,7,5.5,0,5.5,0z M4.2,13.1 c-0.7,0-1.2-0.5-1.2-1.2c0-0.8,1.2-2.3,1.2-2.3s1.2,1.6,1.2,2.3C5.4,12.6,4.9,13.1,4.2,13.1z"
id="path6" />
</svg>

Before

Width:  |  Height:  |  Size: 858 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 484 B

View File

@ -1,14 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="-2.5 0 16 16" style="overflow:visible;enable-background:new -2.5 0 16 16;"
xml:space="preserve" preserveAspectRatio="xMinYMid meet">
<defs>
</defs>
<path style="fill:#99CA3C;" d="M5.5,0C5.5,0,0,7,0,10.5c0,3,2.5,5.5,5.5,5.5s5.5-2.5,5.5-5.5C11,7,5.5,0,5.5,0z M4.2,13.1
c-0.7,0-1.2-0.5-1.2-1.2c0-0.8,1.2-2.3,1.2-2.3s1.2,1.6,1.2,2.3C5.4,12.6,4.9,13.1,4.2,13.1z"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<svg
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"
version="1.1"
x="0px"
y="0px"
width="16px"
height="16px"
viewBox="-2.5 0 16 16"
style="overflow:visible;enable-background:new -2.5 0 16 16;"
xml:space="preserve"
preserveAspectRatio="xMinYMid meet"
id="svg2"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="colour_green.svg"><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" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="753"
inkscape:window-height="480"
id="namedview8"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
id="defs4">
</defs>
<path
style="fill:#99ca3e;fill-opacity:1"
d="M5.5,0C5.5,0,0,7,0,10.5c0,3,2.5,5.5,5.5,5.5s5.5-2.5,5.5-5.5C11,7,5.5,0,5.5,0z M4.2,13.1 c-0.7,0-1.2-0.5-1.2-1.2c0-0.8,1.2-2.3,1.2-2.3s1.2,1.6,1.2,2.3C5.4,12.6,4.9,13.1,4.2,13.1z"
id="path6" />
</svg>

Before

Width:  |  Height:  |  Size: 858 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 480 B

View File

@ -1,14 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="-2.5 0 16 16" style="overflow:visible;enable-background:new -2.5 0 16 16;"
xml:space="preserve" preserveAspectRatio="xMinYMid meet">
<defs>
</defs>
<path style="fill:#EF4542;" d="M5.5,0C5.5,0,0,7,0,10.5c0,3,2.5,5.5,5.5,5.5s5.5-2.5,5.5-5.5C11,7,5.5,0,5.5,0z M4.2,13.1
c-0.7,0-1.2-0.5-1.2-1.2c0-0.8,1.2-2.3,1.2-2.3s1.2,1.6,1.2,2.3C5.4,12.6,4.9,13.1,4.2,13.1z"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<svg
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"
version="1.1"
x="0px"
y="0px"
width="16px"
height="16px"
viewBox="-2.5 0 16 16"
style="overflow:visible;enable-background:new -2.5 0 16 16;"
xml:space="preserve"
preserveAspectRatio="xMinYMid meet"
id="svg2"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="colour_red.svg"><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" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="753"
inkscape:window-height="480"
id="namedview8"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
id="defs4">
</defs>
<path
style="fill:#ef4540;fill-opacity:1"
d="M5.5,0C5.5,0,0,7,0,10.5c0,3,2.5,5.5,5.5,5.5s5.5-2.5,5.5-5.5C11,7,5.5,0,5.5,0z M4.2,13.1 c-0.7,0-1.2-0.5-1.2-1.2c0-0.8,1.2-2.3,1.2-2.3s1.2,1.6,1.2,2.3C5.4,12.6,4.9,13.1,4.2,13.1z"
id="path6" />
</svg>

Before

Width:  |  Height:  |  Size: 858 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 447 B

View File

@ -1,14 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="16px" height="16px" viewBox="-2.5 0 16 16" style="overflow:visible;enable-background:new -2.5 0 16 16;"
xml:space="preserve" preserveAspectRatio="xMinYMid meet">
<defs>
</defs>
<path style="fill:#FFCE34;" d="M5.5,0C5.5,0,0,7,0,10.5c0,3,2.5,5.5,5.5,5.5s5.5-2.5,5.5-5.5C11,7,5.5,0,5.5,0z M4.2,13.1
c-0.7,0-1.2-0.5-1.2-1.2c0-0.8,1.2-2.3,1.2-2.3s1.2,1.6,1.2,2.3C5.4,12.6,4.9,13.1,4.2,13.1z"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In -->
<svg
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"
version="1.1"
x="0px"
y="0px"
width="16px"
height="16px"
viewBox="-2.5 0 16 16"
style="overflow:visible;enable-background:new -2.5 0 16 16;"
xml:space="preserve"
preserveAspectRatio="xMinYMid meet"
id="svg2"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="colour_yellow.svg"><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" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="753"
inkscape:window-height="480"
id="namedview8"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
id="defs4">
</defs>
<path
style="fill:#ffcf35;fill-opacity:1"
d="M5.5,0C5.5,0,0,7,0,10.5c0,3,2.5,5.5,5.5,5.5s5.5-2.5,5.5-5.5C11,7,5.5,0,5.5,0z M4.2,13.1 c-0.7,0-1.2-0.5-1.2-1.2c0-0.8,1.2-2.3,1.2-2.3s1.2,1.6,1.2,2.3C5.4,12.6,4.9,13.1,4.2,13.1z"
id="path6" />
</svg>

Before

Width:  |  Height:  |  Size: 858 B

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -214,10 +214,15 @@ ul.assignfeedback_editpdf_menu {
margin: 0px;
}
.assignfeedback_editpdf_widget .pageheader button:hover {
background-color: #ebebeb;
background-image: radial-gradient(ellipse at center, #ffffff 60%,#dfdfdf 100%);
}
.assignfeedback_editpdf_widget .pageheader button.assignfeedback_editpdf_selectedbutton:hover,
.assignfeedback_editpdf_widget .pageheader button.assignfeedback_editpdf_selectedbutton {
background-color: #CCF;
background-image: none;
background-color: #dfdfdf;
background-image: radial-gradient(ellipse at center, #ffffff 40%,#dfdfdf 100%);
}
.assignfeedback_editpdf_widget .commentdrawable img {

View File

@ -47,21 +47,22 @@ var AJAXBASE = M.cfg.wwwroot + '/mod/assign/feedback/editpdf/ajax.php',
},
SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)',
SELECTEDFILLCOLOUR = 'rgba(200, 200, 255, 0.5)',
COMMENTTEXTCOLOUR = 'rgb(51, 51, 51)',
COMMENTCOLOUR = {
'white' : 'rgb(255,255,255)',
'yellow' : 'rgb(255,255,176)',
'red' : 'rgb(255,176,176)',
'green' : 'rgb(176,255,176)',
'blue' : 'rgb(208,208,255)',
'yellow' : 'rgb(255,236,174)',
'red' : 'rgb(249,181,179)',
'green' : 'rgb(214,234,178)',
'blue' : 'rgb(203,217,237)',
'clear' : 'rgba(255,255,255, 0)'
},
ANNOTATIONCOLOUR = {
'white' : 'rgb(255,255,255)',
'yellow' : 'rgb(255,255,0)',
'red' : 'rgb(255,0,0)',
'green' : 'rgb(0,255,0)',
'blue' : 'rgb(0,0,255)',
'black' : 'rgb(0,0,0)'
'yellow' : 'rgb(255,207,53)',
'red' : 'rgb(239,69,64)',
'green' : 'rgb(152,202,62)',
'blue' : 'rgb(125,159,211)',
'black' : 'rgb(51,51,51)'
},
CLICKTIMEOUT = 300,
TOOLSELECTOR = {
@ -2314,7 +2315,8 @@ COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
node.setStyles({
width: this.width + 'px',
backgroundColor: COMMENTCOLOUR[this.colour]
backgroundColor: COMMENTCOLOUR[this.colour],
color: COMMENTTEXTCOLOUR
});
drawingregion.append(container);

View File

@ -47,21 +47,22 @@ var AJAXBASE = M.cfg.wwwroot + '/mod/assign/feedback/editpdf/ajax.php',
},
SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)',
SELECTEDFILLCOLOUR = 'rgba(200, 200, 255, 0.5)',
COMMENTTEXTCOLOUR = 'rgb(51, 51, 51)',
COMMENTCOLOUR = {
'white' : 'rgb(255,255,255)',
'yellow' : 'rgb(255,255,176)',
'red' : 'rgb(255,176,176)',
'green' : 'rgb(176,255,176)',
'blue' : 'rgb(208,208,255)',
'yellow' : 'rgb(255,236,174)',
'red' : 'rgb(249,181,179)',
'green' : 'rgb(214,234,178)',
'blue' : 'rgb(203,217,237)',
'clear' : 'rgba(255,255,255, 0)'
},
ANNOTATIONCOLOUR = {
'white' : 'rgb(255,255,255)',
'yellow' : 'rgb(255,255,0)',
'red' : 'rgb(255,0,0)',
'green' : 'rgb(0,255,0)',
'blue' : 'rgb(0,0,255)',
'black' : 'rgb(0,0,0)'
'yellow' : 'rgb(255,207,53)',
'red' : 'rgb(239,69,64)',
'green' : 'rgb(152,202,62)',
'blue' : 'rgb(125,159,211)',
'black' : 'rgb(51,51,51)'
},
CLICKTIMEOUT = 300,
TOOLSELECTOR = {
@ -2314,7 +2315,8 @@ COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
node.setStyles({
width: this.width + 'px',
backgroundColor: COMMENTCOLOUR[this.colour]
backgroundColor: COMMENTCOLOUR[this.colour],
color: COMMENTTEXTCOLOUR
});
drawingregion.append(container);

View File

@ -185,7 +185,8 @@ COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
position = this.editor.get_window_coordinates(new M.assignfeedback_editpdf.point(this.x, this.y));
node.setStyles({
width: this.width + 'px',
backgroundColor: COMMENTCOLOUR[this.colour]
backgroundColor: COMMENTCOLOUR[this.colour],
color: COMMENTTEXTCOLOUR
});
drawingregion.append(container);

View File

@ -45,21 +45,22 @@ var AJAXBASE = M.cfg.wwwroot + '/mod/assign/feedback/editpdf/ajax.php',
},
SELECTEDBORDERCOLOUR = 'rgba(200, 200, 255, 0.9)',
SELECTEDFILLCOLOUR = 'rgba(200, 200, 255, 0.5)',
COMMENTTEXTCOLOUR = 'rgb(51, 51, 51)',
COMMENTCOLOUR = {
'white' : 'rgb(255,255,255)',
'yellow' : 'rgb(255,255,176)',
'red' : 'rgb(255,176,176)',
'green' : 'rgb(176,255,176)',
'blue' : 'rgb(208,208,255)',
'yellow' : 'rgb(255,236,174)',
'red' : 'rgb(249,181,179)',
'green' : 'rgb(214,234,178)',
'blue' : 'rgb(203,217,237)',
'clear' : 'rgba(255,255,255, 0)'
},
ANNOTATIONCOLOUR = {
'white' : 'rgb(255,255,255)',
'yellow' : 'rgb(255,255,0)',
'red' : 'rgb(255,0,0)',
'green' : 'rgb(0,255,0)',
'blue' : 'rgb(0,0,255)',
'black' : 'rgb(0,0,0)'
'yellow' : 'rgb(255,207,53)',
'red' : 'rgb(239,69,64)',
'green' : 'rgb(152,202,62)',
'blue' : 'rgb(125,159,211)',
'black' : 'rgb(51,51,51)'
},
CLICKTIMEOUT = 300,
TOOLSELECTOR = {