External report and version v2.1
This commit is contained in:
Jane Adelmann
parent
7dfcf3831f
commit
6e1758e001
|
|
@ -1,172 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
|
||||
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
|
||||
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
|
||||
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
|
||||
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
|
||||
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
|
||||
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
|
||||
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
|
||||
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
|
||||
]>
|
||||
<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="715px" height="175px"
|
||||
viewBox="0 0 715 175" enable-background="new 0 0 715 175" xml:space="preserve">
|
||||
<metadata>
|
||||
<sfw xmlns="&ns_sfw;">
|
||||
<slices></slices>
|
||||
<sliceSourceBounds width="714.615" height="175.266" x="242.797" y="-687.791" bottomLeftOrigin="true"></sliceSourceBounds>
|
||||
</sfw>
|
||||
</metadata>
|
||||
<g>
|
||||
<g>
|
||||
<path fill="#333333" d="M232.751,46.809v25.788h-5.347V9.283h21.568c6.581,0,11.776,1.681,15.59,5.044
|
||||
c3.811,3.363,5.718,7.988,5.718,13.87c0,5.946-1.833,10.533-5.502,13.764c-3.666,3.234-8.977,4.848-15.935,4.848H232.751z
|
||||
M232.751,42.286h16.222c5.189,0,9.145-1.233,11.873-3.701c2.722-2.467,4.084-5.908,4.084-10.321
|
||||
c0-4.384-1.353-7.875-4.064-10.475c-2.709-2.596-6.559-3.927-11.545-3.984h-16.569V42.286z"/>
|
||||
<path fill="#333333" d="M286.608,68.074h31.264v4.522h-36.656V9.283h5.392V68.074z"/>
|
||||
<path fill="#333333" d="M365.573,54.81h-28.742l-6.526,17.787h-5.608l23.962-63.313h5.086l23.962,63.313h-5.566L365.573,54.81z
|
||||
M338.48,50.288h25.396l-12.698-34.482L338.48,50.288z"/>
|
||||
<path fill="#333333" d="M430.191,65.072c-1.855,2.642-4.761,4.696-8.717,6.178c-3.958,1.475-8.388,2.216-13.283,2.216
|
||||
c-4.961,0-9.367-1.188-13.22-3.565c-3.858-2.377-6.845-5.74-8.961-10.088c-2.116-4.349-3.188-9.335-3.215-14.959v-8.001
|
||||
c0-8.784,2.217-15.719,6.652-20.809c4.435-5.086,10.394-7.631,17.873-7.631c6.52,0,11.767,1.659,15.738,4.98
|
||||
c3.972,3.318,6.336,7.892,7.09,13.719h-5.351c-0.779-4.655-2.673-8.178-5.672-10.578c-3.002-2.396-6.922-3.598-11.764-3.598
|
||||
c-5.914,0-10.598,2.104-14.047,6.311c-3.45,4.207-5.173,10.14-5.173,17.8v7.485c0,4.815,0.817,9.074,2.457,12.772
|
||||
c1.637,3.698,3.984,6.564,7.045,8.594c3.057,2.033,6.571,3.047,10.546,3.047c4.605,0,8.564-0.725,11.869-2.174
|
||||
c2.146-0.957,3.74-2.071,4.783-3.347v-16.35h-17V42.55h22.348V65.072z"/>
|
||||
<path fill="#333333" d="M450.304,72.597h-5.351V9.283h5.351V72.597z"/>
|
||||
<path fill="#333333" d="M501.395,54.81h-28.743l-6.525,17.787h-5.608l23.962-63.313h5.086l23.96,63.313h-5.565L501.395,54.81z
|
||||
M474.301,50.288h25.395l-12.697-34.482L474.301,50.288z"/>
|
||||
<path fill="#333333" d="M546.845,46.203h-18.393v26.394h-5.392V9.283h20.563c6.758,0,12.034,1.636,15.829,4.909
|
||||
c3.801,3.273,5.701,7.847,5.701,13.725c0,4.052-1.192,7.627-3.569,10.727c-2.377,3.099-5.565,5.24-9.566,6.429l15.828,26.957
|
||||
v0.567h-5.694L546.845,46.203z M528.452,41.681h16.389c4.497,0,8.104-1.279,10.829-3.833c2.726-2.558,4.091-5.866,4.091-9.931
|
||||
c0-4.471-1.423-7.94-4.265-10.411c-2.841-2.467-6.828-3.701-11.956-3.701h-15.088V41.681z"/>
|
||||
<path fill="#333333" d="M584.621,72.597h-5.354V9.283h5.354V72.597z"/>
|
||||
<path fill="#333333" d="M636.417,57.029c0-3.508-1.23-6.284-3.698-8.327c-2.461-2.045-6.971-3.988-13.522-5.827
|
||||
c-6.552-1.843-11.331-3.85-14.347-6.023c-4.29-3.073-6.436-7.103-6.436-12.089c0-4.841,1.991-8.777,5.979-11.805
|
||||
c3.987-3.031,9.077-4.545,15.281-4.545c4.206,0,7.969,0.812,11.286,2.436c3.317,1.623,5.895,3.885,7.718,6.783
|
||||
c1.83,2.899,2.738,6.133,2.738,9.696h-5.393c0-4.329-1.475-7.811-4.432-10.443s-6.933-3.949-11.918-3.949
|
||||
c-4.839,0-8.697,1.083-11.564,3.244c-2.873,2.164-4.303,4.989-4.303,8.471c0,3.224,1.288,5.853,3.865,7.885
|
||||
c2.583,2.032,6.713,3.823,12.395,5.379c5.682,1.553,9.985,3.164,12.917,4.829c2.924,1.668,5.128,3.663,6.609,5.979
|
||||
c1.475,2.322,2.216,5.06,2.216,8.22c0,4.986-1.99,8.987-5.979,12.002c-3.987,3.015-9.237,4.522-15.764,4.522
|
||||
c-4.465,0-8.556-0.799-12.285-2.39c-3.724-1.594-6.552-3.826-8.479-6.7c-1.926-2.867-2.892-6.159-2.892-9.869h5.347
|
||||
c0,4.464,1.668,7.988,5.006,10.565c3.33,2.583,7.769,3.872,13.303,3.872c4.929,0,8.884-1.089,11.873-3.26
|
||||
C634.922,63.507,636.417,60.624,636.417,57.029z"/>
|
||||
<path fill="#333333" d="M660.491,9.283l23.353,55.879L707.28,9.283h7.132v63.313h-5.347V45.027l0.438-28.265l-23.571,55.834h-4.13
|
||||
L658.32,16.981l0.432,27.872v27.743h-5.348V9.283H660.491z"/>
|
||||
<path fill="#333333" d="M272.235,145.21c-0.725,6.668-3.108,11.77-7.151,15.307c-4.045,3.536-9.431,5.305-16.157,5.305
|
||||
c-4.696,0-8.849-1.172-12.456-3.523c-3.611-2.345-6.4-5.673-8.372-9.979c-1.971-4.303-2.973-9.225-3.002-14.762v-8.217
|
||||
c0-5.624,0.986-10.61,2.957-14.959c1.972-4.349,4.806-7.705,8.504-10.069c3.694-2.361,7.95-3.543,12.762-3.543
|
||||
c6.784,0,12.141,1.826,16.067,5.479c3.93,3.652,6.21,8.713,6.848,15.174h-5.392c-1.333-10.752-7.173-16.131-17.523-16.131
|
||||
c-5.74,0-10.313,2.148-13.718,6.442c-3.408,4.293-5.112,10.227-5.112,17.796v7.747c0,7.312,1.662,13.142,4.979,17.497
|
||||
c3.321,4.352,7.808,6.525,13.458,6.525c5.595,0,9.814-1.34,12.655-4.022c2.841-2.681,4.594-6.703,5.26-12.066H272.235z"/>
|
||||
<path fill="#333333" d="M331.159,164.952h-5.392V134.6h-36.179v30.353h-5.347v-63.313h5.347v28.438h36.179v-28.438h5.392V164.952z
|
||||
"/>
|
||||
<path fill="#333333" d="M381.26,134.6h-29.614v25.83h34.05v4.522h-39.397v-63.313h39.182v4.521h-33.834v23.917h29.614V134.6z"/>
|
||||
<path fill="#333333" d="M440.035,145.21c-0.725,6.668-3.108,11.77-7.151,15.307c-4.046,3.536-9.431,5.305-16.157,5.305
|
||||
c-4.696,0-8.848-1.172-12.455-3.523c-3.611-2.345-6.4-5.673-8.372-9.979c-1.971-4.303-2.973-9.225-3.002-14.762v-8.217
|
||||
c0-5.624,0.985-10.61,2.957-14.959s4.806-7.705,8.504-10.069c3.694-2.361,7.949-3.543,12.762-3.543
|
||||
c6.783,0,12.14,1.826,16.066,5.479c3.93,3.652,6.211,8.713,6.849,15.174h-5.393c-1.333-10.752-7.173-16.131-17.522-16.131
|
||||
c-5.74,0-10.314,2.148-13.719,6.442c-3.408,4.293-5.111,10.227-5.111,17.796v7.747c0,7.312,1.662,13.142,4.979,17.497
|
||||
c3.32,4.352,7.808,6.525,13.457,6.525c5.596,0,9.815-1.34,12.656-4.022c2.841-2.681,4.593-6.703,5.26-12.066H440.035z"/>
|
||||
<path fill="#333333" d="M466.303,133.514l-8.916,8.781v22.657h-5.347v-63.313h5.347v34.137l32.443-34.137h6.738l-26.525,28.178
|
||||
l28.567,35.136h-6.52L466.303,133.514z"/>
|
||||
<path fill="#BFBFBF" d="M507.418,161.821c0-1.015,0.329-1.878,0.979-2.587c0.651-0.712,1.56-1.066,2.719-1.066
|
||||
s2.068,0.354,2.738,1.066c0.663,0.709,0.998,1.572,0.998,2.587s-0.335,1.849-0.998,2.499c-0.67,0.654-1.579,0.979-2.738,0.979
|
||||
s-2.067-0.325-2.719-0.979C507.747,163.67,507.418,162.836,507.418,161.821z"/>
|
||||
<path fill="#BFBFBF" d="M573.689,136.729c0,5.83-1.005,10.945-3.021,15.352c-2.017,4.407-4.89,7.799-8.633,10.176
|
||||
c-3.736,2.377-8.059,3.565-12.955,3.565c-7.396,0-13.367-2.645-17.916-7.937c-4.555-5.289-6.828-12.427-6.828-21.414v-6.525
|
||||
c0-5.766,1.023-10.878,3.066-15.326c2.042-4.451,4.935-7.872,8.671-10.263c3.743-2.393,8.046-3.588,12.917-3.588
|
||||
c4.87,0,9.167,1.173,12.896,3.523c3.724,2.346,6.597,5.666,8.626,9.957c2.029,4.29,3.093,9.261,3.177,14.917V136.729z
|
||||
M568.342,129.861c0-7.624-1.727-13.596-5.173-17.916c-3.453-4.319-8.175-6.48-14.179-6.48c-5.882,0-10.572,2.168-14.063,6.5
|
||||
c-3.498,4.336-5.244,10.389-5.244,18.154v6.609c0,7.512,1.739,13.461,5.218,17.852c3.479,4.394,8.208,6.59,14.18,6.59
|
||||
c6.056,0,10.784-2.167,14.173-6.503c3.395-4.332,5.089-10.369,5.089-18.112V129.861z"/>
|
||||
<path fill="#BFBFBF" d="M610.255,138.559h-18.393v26.394h-5.392v-63.313h20.569c6.752,0,12.027,1.636,15.829,4.908
|
||||
c3.794,3.272,5.694,7.847,5.694,13.726c0,4.052-1.191,7.627-3.568,10.726c-2.378,3.099-5.566,5.241-9.567,6.43l15.829,26.957
|
||||
v0.567h-5.695L610.255,138.559z M591.862,134.036h16.396c4.49,0,8.098-1.279,10.823-3.833c2.725-2.558,4.091-5.866,4.091-9.931
|
||||
c0-4.472-1.424-7.94-4.265-10.411c-2.842-2.467-6.822-3.701-11.957-3.701h-15.088V134.036z"/>
|
||||
<path fill="#BFBFBF" d="M687.13,157.428c-1.855,2.641-4.761,4.696-8.717,6.178c-3.955,1.476-8.388,2.216-13.283,2.216
|
||||
c-4.961,0-9.367-1.188-13.22-3.565c-3.859-2.377-6.842-5.74-8.961-10.089c-2.113-4.349-3.189-9.334-3.215-14.958v-8.002
|
||||
c0-8.783,2.216-15.719,6.654-20.808c4.433-5.086,10.392-7.631,17.871-7.631c6.52,0,11.77,1.659,15.738,4.979
|
||||
c3.975,3.318,6.339,7.892,7.093,13.719h-5.354c-0.779-4.654-2.674-8.178-5.669-10.578c-3.002-2.396-6.926-3.598-11.764-3.598
|
||||
c-5.914,0-10.598,2.104-14.05,6.31c-3.447,4.207-5.174,10.141-5.174,17.8v7.486c0,4.815,0.818,9.073,2.461,12.771
|
||||
c1.637,3.697,3.981,6.564,7.042,8.594c3.06,2.032,6.57,3.047,10.546,3.047c4.605,0,8.567-0.725,11.872-2.174
|
||||
c2.146-0.957,3.737-2.071,4.78-3.347v-16.351h-17.001v-4.522h22.349V157.428z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path fill="#2F6A8F" d="M132.349,82.138c13.226,8.048,26.381,17.02,40.786,25.603c0.324-1.405,0.614-2.822,0.87-4.252
|
||||
c-15.069-9.138-28.808-18.724-42.792-27.186C131.718,78.201,132.095,80.15,132.349,82.138z"/>
|
||||
<path fill="#2F6A8F" d="M173.236,68.563c-0.469-2.086-1.013-4.145-1.627-6.172c-36.411-25.224-71.042-50.924-134.535-46.475
|
||||
c-2.168,1.521-4.264,3.138-6.283,4.844C99.015,13.78,134.319,41.884,173.236,68.563z"/>
|
||||
<path fill="#2F6A8F" d="M174.998,79.753c-0.168-1.826-0.388-3.637-0.667-5.429C133.14,46.488,97.469,16.316,25.373,25.73
|
||||
c-1.627,1.625-3.188,3.316-4.685,5.064C95.889,19.099,131.734,50.999,174.998,79.753z"/>
|
||||
<path fill="#2F6A8F" d="M164.09,131.033c0.681-1.207,1.334-2.432,1.959-3.674c-13.145-7.224-25.243-14.609-37.103-21.345
|
||||
c-0.613,1.398-1.295,2.759-2.041,4.079C138.789,116.668,150.921,123.909,164.09,131.033z"/>
|
||||
<path fill="#2F6A8F" d="M159.591,138.184c0.812-1.161,1.595-2.343,2.351-3.545c-13.278-7.067-25.521-14.207-37.512-20.64
|
||||
c-0.92,1.3-1.906,2.55-2.955,3.743C133.667,124.053,146.111,131.13,159.591,138.184z"/>
|
||||
<path fill="#2F6A8F" d="M100.324,118.792c2.023-0.846,3.935-1.884,5.734-3.094C89.421,108.246,73,102.803,54,101.322v5.605
|
||||
C71,108.288,85.471,112.688,100.324,118.792z"/>
|
||||
<path fill="#2F6A8F" d="M116.506,104.508c0.777-1.354,1.461-2.767,2.045-4.231c-19.865-10.582-39.752-18.627-63.56-20.243
|
||||
c-0.404,1.664-0.681,3.376-0.825,5.125C77.327,86.7,96.897,94.356,116.506,104.508z"/>
|
||||
<path fill="#2F6A8F" d="M132.498,92.541c12.318,7.396,24.763,15.512,38.339,23.335c0.444-1.324,0.858-2.662,1.24-4.015
|
||||
c-13.922-8.155-26.663-16.648-39.356-24.345c0.001,0.135,0.01,0.268,0.01,0.403C132.731,89.479,132.652,91.021,132.498,92.541z"/>
|
||||
<path fill="#2F6A8F" d="M56.618,75.061c23.86,1.796,43.678,10.005,63.367,20.72c0.378-1.563,0.647-3.167,0.796-4.806
|
||||
c-19.069-10.521-38.406-18.649-61.67-20.725C58.157,71.776,57.319,73.383,56.618,75.061z"/>
|
||||
<path fill="#2F6A8F" d="M110.396,112.23c1.227-1.158,2.354-2.407,3.394-3.737C94.868,99.05,76,91.987,54,90.438v5.383
|
||||
C75,97.359,92.454,103.686,110.396,112.23z"/>
|
||||
<path fill="#2F6A8F" d="M0,154.646c0,2.284,0,4.468,0,6.523c15-3.829,29-5.433,42-5.333v-6.682C29,149.052,15,150.701,0,154.646z"
|
||||
/>
|
||||
<path fill="#2F6A8F" d="M85.907,121h1.582c1.393,0,2.741,0.088,4.09-0.078C79.487,116.637,67,113.782,54,112.657v5.844
|
||||
C60,119.046,66.308,120,72.236,121h13.68H85.907z"/>
|
||||
<path fill="#2F6A8F" d="M130.563,101.749c11.921,6.924,24.057,14.497,37.259,21.867c0.561-1.26,1.094-2.536,1.596-3.826
|
||||
c-13.344-7.567-25.593-15.38-37.664-22.522C131.435,98.791,131.034,100.285,130.563,101.749z"/>
|
||||
<path fill="#2F6A8F" d="M120.852,85.794c-0.122-1.938-0.411-3.83-0.851-5.665c-16.272-8.952-33.091-15.993-52.802-18.774
|
||||
c-1.681,1.287-3.236,2.728-4.645,4.304C84.491,68.084,102.884,75.834,120.852,85.794z"/>
|
||||
<path fill="#2F6A8F" d="M123.476,168.118C99.771,158.931,78,151.686,54,149.69v6.669c21,1.7,40.892,7.356,61.779,14.786
|
||||
C118.398,170.255,120.974,169.243,123.476,168.118z"/>
|
||||
<path fill="#2F6A8F" d="M169.291,55.711c-0.99-2.514-2.097-4.969-3.306-7.363C135.597,27.336,103.959,7.586,53.197,6.964
|
||||
c-3.003,1.274-5.918,2.714-8.74,4.301C102.203,9.389,135.683,32.33,169.291,55.711z"/>
|
||||
<path fill="#2F6A8F" d="M138.97,16.677c-11.215-8.119-24.421-13.654-38.749-15.733C114.585,4.898,127.261,10.382,138.97,16.677z"
|
||||
/>
|
||||
<path fill="#2F6A8F" d="M161.189,40.021c-2.252-3.459-4.739-6.75-7.442-9.85C132.529,16.68,109.087,5.016,78.072,0.525
|
||||
c-4.822,0.514-9.526,1.418-14.083,2.68C106.107,6.086,134.713,22.15,161.189,40.021z"/>
|
||||
<path fill="#2F6A8F" d="M42,90.144c-13,0.265-27,2.409-42,6.986c0,1.6,0,3.354,0,5.236c15-4.564,29-6.674,42-6.882V90.144z"/>
|
||||
<path fill="#2F6A8F" d="M129.772,164.974c1.83-1.007,3.61-2.076,5.358-3.207C106.989,149.547,82,139.273,54,136.812v6.368
|
||||
C80,145.428,103.697,154.202,129.772,164.974z"/>
|
||||
<path fill="#2F6A8F" d="M144.015,155.218c-18.231-8.524-34.943-16.604-51.827-22.377c-1.545,0.16-3.113,0.159-4.7,0.159H71.374
|
||||
c22.886,5,44.462,14.566,68.481,25.426C141.276,157.369,142.662,156.355,144.015,155.218z"/>
|
||||
<path fill="#2F6A8F" d="M42,112.174c-13,0.054-27,2.026-42,6.481c0,1.856,0,3.745,0,5.656c15-4.396,29-6.306,42-6.314V112.174z"/>
|
||||
<path fill="#2F6A8F" d="M42,100.925c-13,0.154-27,2.226-42,6.765c0,1.74,0,3.554,0,5.418c15-4.505,29-6.511,42-6.613V100.925z"/>
|
||||
<path fill="#2F6A8F" d="M105.694,173.913C88.391,168.499,72,164.522,54,163.177v6.977c12,0.852,23.422,2.846,35.038,5.638
|
||||
C94.735,175.689,100.312,175.049,105.694,173.913z"/>
|
||||
<path fill="#2F6A8F" d="M157.021,141.679c-13.798-7.092-26.54-14.15-39.048-20.353c-1.332,1.217-2.743,2.347-4.213,3.399
|
||||
c12.983,6.107,26.174,13.202,40.454,20.398C155.178,144,156.113,142.851,157.021,141.679z"/>
|
||||
<path fill="#2F6A8F" d="M42,142.621v-6.369c-13-0.081-27,1.67-42,5.821c0,2.101,0,4.174,0,6.2C15,144.221,29,142.525,42,142.621z"
|
||||
/>
|
||||
<path fill="#2F6A8F" d="M42.987,79.778c-13.055,0.307-27.132,2.516-43.181,7.165C-0.197,87.269,0,87.593,0,87.92
|
||||
c0,0.803,0,2.207,0,4.082c15-4.587,29.644-6.771,42.548-7.081C42.664,83.177,42.68,81.463,42.987,79.778z"/>
|
||||
<path fill="#2F6A8F" d="M42,130.026v-6.091c-13-0.027-27,1.83-42,6.154c0,1.974,0,3.953,0,5.925C15,131.772,29,129.968,42,130.026
|
||||
z"/>
|
||||
<path fill="#2F6A8F" d="M42,169.696v-7.021c-13-0.088-27,1.472-42,5.181c0,2.793,0,5.131,0,6.869
|
||||
C15,171.142,29,169.628,42,169.696z"/>
|
||||
<path fill="#2F6A8F" d="M174.675,99.1c0.19-1.503,0.342-3.018,0.456-4.543c-17.533-11.027-33.417-22.683-50.372-32.249
|
||||
c1.621,2.352,3.022,4.863,4.181,7.506C144.057,78.776,158.64,89.199,174.675,99.1z"/>
|
||||
<path fill="#2F6A8F" d="M117.771,73.759c-1.311-2.794-2.999-5.376-4.996-7.686c-9.418-4.67-19.232-8.573-29.873-11.279
|
||||
c-3.314,0.457-6.473,1.4-9.406,2.757C89.762,60.559,104.057,66.424,117.771,73.759z"/>
|
||||
<path fill="#2F6A8F" d="M151.14,148.528c-14.992-7.393-28.835-14.594-42.52-20.613c-2.116,1.123-4.333,2.078-6.63,2.857
|
||||
c14.792,5.926,29.646,13.365,45.764,21.118C148.911,150.8,150.042,149.681,151.14,148.528z"/>
|
||||
<path fill="#2F6A8F" d="M91.254,42.839c9.083,0.753,17.41,4.198,24.184,9.538c20.922,10.271,39.362,24.289,59.917,37.46
|
||||
c0.014-0.638,0.024-1.276,0.024-1.917c0-1.007-0.023-2.009-0.057-3.009c-45.159-29.479-81.055-62.804-158.694-49
|
||||
c-1.227,1.669-2.397,3.382-3.506,5.138C45.008,34.747,69.88,36.515,91.254,42.839z"/>
|
||||
<path fill="#2F6A8F" d="M48.582,64.869c0.984-1.656,2.068-3.246,3.25-4.758c-14.651-0.347-30.954,1.603-49.662,6.603
|
||||
c-0.416,1.677-0.784,3.372-1.101,5.085C18.862,66.893,34.477,64.805,48.582,64.869z"/>
|
||||
<path fill="#2F6A8F" d="M46.059,69.741c-13.662,0.131-28.72,2.303-45.78,7.119c-0.209,1.665-0.367,3.345-0.481,5.038
|
||||
c16.491-4.733,31.107-6.934,44.425-7.183C44.743,73.014,45.35,71.351,46.059,69.741z"/>
|
||||
<path fill="#2F6A8F" d="M67.761,47.209c2.826-1.376,5.816-2.464,8.932-3.23c-18.755-3.525-40.283-3.456-66.583,2.21
|
||||
c-0.911,1.686-1.767,3.406-2.569,5.156C30.902,45.946,50.507,45.035,67.761,47.209z"/>
|
||||
<path fill="#2F6A8F" d="M55.942,55.519c1.619-1.577,3.357-3.03,5.197-4.353c-16.17-1.329-34.396,0.086-55.756,5.32
|
||||
c-0.646,1.685-1.245,3.392-1.788,5.125C23.462,56.504,40.616,54.768,55.942,55.519z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 16 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 226 KiB |
|
|
@ -1,42 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
|
||||
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
|
||||
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
|
||||
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
|
||||
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
|
||||
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
|
||||
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
|
||||
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
|
||||
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
|
||||
]>
|
||||
<svg version="1.1" id="Шар_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="8px" height="4px"
|
||||
viewBox="0 0 8 4" enable-background="new 0 0 8 4" xml:space="preserve">
|
||||
<metadata>
|
||||
<sfw xmlns="&ns_sfw;">
|
||||
<slices></slices>
|
||||
<sliceSourceBounds width="8" height="4" x="-1" y="-0.5" bottomLeftOrigin="true"></sliceSourceBounds>
|
||||
</sfw>
|
||||
</metadata>
|
||||
<rect fill="#A13169" width="1" height="1"/>
|
||||
<rect x="1" opacity="0.2" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="2" y="1" opacity="0.2" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="4" y="1" opacity="0.2" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="5" opacity="0.2" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="6" y="1" opacity="0.5" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="5" y="2" opacity="0.5" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="3" y="3" opacity="0.5" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="2" y="3" opacity="0.5" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="4" y="3" opacity="0.5" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="1" y="2" opacity="0.5" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect y="1" opacity="0.5" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="1" y="1" fill="#A13169" width="1" height="1"/>
|
||||
<rect x="2" y="2" fill="#A13169" width="1" height="1"/>
|
||||
<rect x="4" y="2" fill="#A13169" width="1" height="1"/>
|
||||
<rect x="3" y="2" fill="#A13169" width="1" height="1"/>
|
||||
<rect x="5" y="1" fill="#A13169" width="1" height="1"/>
|
||||
<rect x="6" fill="#A13169" width="1" height="1"/>
|
||||
<rect x="7" y="1" opacity="0.5" fill="#A13169" enable-background="new " width="1" height="1"/>
|
||||
<rect x="7" fill="#A13169" width="1" height="1"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.8 KiB |
|
|
@ -1,42 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
|
||||
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
|
||||
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
|
||||
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
|
||||
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
|
||||
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
|
||||
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
|
||||
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
|
||||
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
|
||||
]>
|
||||
<svg version="1.1" id="Шар_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="8px" height="4px"
|
||||
viewBox="0 0 8 4" enable-background="new 0 0 8 4" xml:space="preserve">
|
||||
<metadata>
|
||||
<sfw xmlns="&ns_sfw;">
|
||||
<slices></slices>
|
||||
<sliceSourceBounds width="8" height="4" x="-1" y="-0.5" bottomLeftOrigin="true"></sliceSourceBounds>
|
||||
</sfw>
|
||||
</metadata>
|
||||
<rect fill="#639EC3" width="1" height="1"/>
|
||||
<rect x="1" opacity="0.2" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="2" y="1" opacity="0.2" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="4" y="1" opacity="0.2" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="5" opacity="0.2" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="6" y="1" opacity="0.5" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="5" y="2" opacity="0.5" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="3" y="3" opacity="0.5" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="2" y="3" opacity="0.5" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="4" y="3" opacity="0.5" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="1" y="2" opacity="0.5" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect y="1" opacity="0.5" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="1" y="1" fill="#639EC3" width="1" height="1"/>
|
||||
<rect x="2" y="2" fill="#639EC3" width="1" height="1"/>
|
||||
<rect x="4" y="2" fill="#639EC3" width="1" height="1"/>
|
||||
<rect x="3" y="2" fill="#639EC3" width="1" height="1"/>
|
||||
<rect x="5" y="1" fill="#639EC3" width="1" height="1"/>
|
||||
<rect x="6" fill="#639EC3" width="1" height="1"/>
|
||||
<rect x="7" y="1" opacity="0.5" fill="#639EC3" enable-background="new " width="1" height="1"/>
|
||||
<rect x="7" fill="#639EC3" width="1" height="1"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.8 KiB |
|
|
@ -1,42 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
|
||||
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
|
||||
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
|
||||
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
|
||||
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
|
||||
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
|
||||
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
|
||||
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
|
||||
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
|
||||
]>
|
||||
<svg version="1.1" id="Шар_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="8px" height="4px"
|
||||
viewBox="0 0 8 4" enable-background="new 0 0 8 4" xml:space="preserve">
|
||||
<metadata>
|
||||
<sfw xmlns="&ns_sfw;">
|
||||
<slices></slices>
|
||||
<sliceSourceBounds width="8" height="4" x="-1" y="-0.5" bottomLeftOrigin="true"></sliceSourceBounds>
|
||||
</sfw>
|
||||
</metadata>
|
||||
<rect fill="#289870" width="1" height="1"/>
|
||||
<rect x="1" opacity="0.2" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="2" y="1" opacity="0.2" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="4" y="1" opacity="0.2" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="5" opacity="0.2" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="6" y="1" opacity="0.5" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="5" y="2" opacity="0.5" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="3" y="3" opacity="0.5" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="2" y="3" opacity="0.5" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="4" y="3" opacity="0.5" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="1" y="2" opacity="0.5" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect y="1" opacity="0.5" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="1" y="1" fill="#289870" width="1" height="1"/>
|
||||
<rect x="2" y="2" fill="#289870" width="1" height="1"/>
|
||||
<rect x="4" y="2" fill="#289870" width="1" height="1"/>
|
||||
<rect x="3" y="2" fill="#289870" width="1" height="1"/>
|
||||
<rect x="5" y="1" fill="#289870" width="1" height="1"/>
|
||||
<rect x="6" fill="#289870" width="1" height="1"/>
|
||||
<rect x="7" y="1" opacity="0.5" fill="#289870" enable-background="new " width="1" height="1"/>
|
||||
<rect x="7" fill="#289870" width="1" height="1"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.8 KiB |
|
|
@ -236,23 +236,11 @@ class plagiarism_pchkorg_api_provider {
|
|||
return $id;
|
||||
}
|
||||
|
||||
public function get_report($id) {
|
||||
$curl = new curl();
|
||||
$response = $curl->get($this->endpoint . '/api/v1/text/report/' . $id, array(), array(
|
||||
'CURLOPT_RETURNTRANSFER' => true,
|
||||
'CURLOPT_FOLLOWLOCATION' => true,
|
||||
'CURLOPT_SSL_VERIFYHOST' => false,
|
||||
'CURLOPT_SSL_VERIFYPEER' => false,
|
||||
'CURLOPT_POST' => false,
|
||||
'CURLOPT_HTTPHEADER' => array(
|
||||
'X-API-TOKEN: ' . $this->generate_api_token(),
|
||||
),
|
||||
));
|
||||
|
||||
return $response;
|
||||
public function get_report_action($id) {
|
||||
return "{$this->endpoint}/lms/public-report/{$id}/";
|
||||
}
|
||||
|
||||
private function generate_api_token() {
|
||||
public function generate_api_token() {
|
||||
global $USER;
|
||||
|
||||
if ($this->is_group_token()) {
|
||||
|
|
|
|||
4
lib.php
4
lib.php
|
|
@ -69,11 +69,13 @@ class plagiarism_plugin_pchkorg extends plagiarism_plugin {
|
|||
|
||||
if ($filerecord) {
|
||||
$label = sprintf('%.2f', $filerecord->score) . '%';
|
||||
$link = sprintf(' <a href="%s" target="_blank">( %s )</a> ', $checkurl->__toString(), $label);
|
||||
} else {
|
||||
$label = get_string('pchkorg_check_for_plagiarism', 'plagiarism_pchkorg');
|
||||
$link = sprintf(' <a href="%s">( %s )</a> ', $checkurl->__toString(), $label);
|
||||
}
|
||||
|
||||
return sprintf(' <a href="%s">( %s )</a> ', $checkurl->__toString(), $label);
|
||||
return $link;
|
||||
}
|
||||
|
||||
/* hook to save plagiarism specific settings on a module settings page
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ $cm = get_coursemodule_from_id('', $cmid, 0, false, MUST_EXIST);
|
|||
require_login($cm->course, true, $cm);
|
||||
$context = context_module::instance($cm->id);// Get context of course.
|
||||
|
||||
|
||||
$isgranted = is_viewing($context, null, 'plagiarism/pchkorg:check');
|
||||
if (!$isgranted) {
|
||||
die('403 permission denied');
|
||||
|
|
@ -156,14 +155,8 @@ if (!$filerecord) {
|
|||
|
||||
require('../view/send_text.php');
|
||||
} else if (null !== $filerecord->reportid) {
|
||||
$report = $apiprovider->get_report($filerecord->textid);
|
||||
$json = json_decode($report);
|
||||
$error = '';
|
||||
if (isset($json->message)) {
|
||||
$error = $json->message;
|
||||
} else {
|
||||
$data = $report;
|
||||
}
|
||||
$action = $apiprovider->get_report_action($filerecord->textid);
|
||||
$token = $apiprovider->generate_api_token();
|
||||
|
||||
require('../view/report.php');
|
||||
} else if (null !== $filerecord->textid) {
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ defined('MOODLE_INTERNAL') || die();
|
|||
if (!isset($plugin)) {
|
||||
$plugin = new stdClass();
|
||||
}
|
||||
$plugin->version = 2019013002;
|
||||
$plugin->version = 2019013003;
|
||||
$plugin->requires = 2017051501; // Requires Moodle 3.3 .
|
||||
$plugin->release = 'v2.0';
|
||||
$plugin->release = 'v2.1';
|
||||
$plugin->maturity = MATURITY_STABLE;
|
||||
|
||||
$plugin->component = 'plagiarism_pchkorg';
|
||||
|
|
|
|||
|
|
@ -17,26 +17,17 @@
|
|||
defined('MOODLE_INTERNAL') || die();
|
||||
|
||||
if (empty($error)) {
|
||||
$PAGE->requires->css(new moodle_url('/plagiarism/pchkorg/assets/viewer/public-report.min.css'));
|
||||
$PAGE->requires->js(new moodle_url('/plagiarism/pchkorg/assets/viewer/public-report.bundle.min.js'), true);
|
||||
$PAGE->requires->js_init_code(
|
||||
'
|
||||
initPublicReport({
|
||||
container: window.document.getElementById(\'report-root\'),
|
||||
basename: "'.$currenturl->get_path().'",
|
||||
localData: ' . (empty($data) ? '{}' : $data) . '
|
||||
});
|
||||
', true
|
||||
);
|
||||
}
|
||||
|
||||
echo $OUTPUT->header();
|
||||
|
||||
?>
|
||||
<div class="pCheck-container"></div>
|
||||
<div id="report-root"></div>
|
||||
<?php
|
||||
if (!empty($error)) {
|
||||
$PAGE->requires->js_init_code('window.document.getElementById("plagiarism_pchkorg_report_id").submit();', true);
|
||||
echo $OUTPUT->header();
|
||||
?>
|
||||
<form id="plagiarism_pchkorg_report_id" action="<?php echo htmlspecialchars($action) ?>" method="post">
|
||||
<input type="hidden" name="token" value="<?php echo htmlspecialchars($token) ?>"/>
|
||||
<input type="hidden" name="lms-type" value="moodle"/>
|
||||
<input type="submit" value="Check Report">
|
||||
</form>
|
||||
<?php
|
||||
} else {
|
||||
echo $OUTPUT->header();
|
||||
?>
|
||||
<h2>Error: <?php
|
||||
echo htmlspecialchars($error) ?></h2>
|
||||
|
|
|
|||
Loading…
Reference in New Issue