Merge lp:~jose/charms/precise/byobu-classroom/1297694-fix into lp:charms/byobu-classroom
- Precise Pangolin (12.04)
- 1297694-fix
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 13 | ||||
Proposed branch: | lp:~jose/charms/precise/byobu-classroom/1297694-fix | ||||
Merge into: | lp:charms/byobu-classroom | ||||
Diff against target: |
808 lines (+771/-2) 4 files modified
README.md (+29/-0) hooks/install (+1/-1) icon.svg (+739/-0) metadata.yaml (+2/-1) |
||||
To merge this branch: | bzr merge lp:~jose/charms/precise/byobu-classroom/1297694-fix | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Ceppi (community) | Approve | ||
charmers | Pending | ||
Review via email: mp+212787@code.launchpad.net |
Commit message
Charm no longer access EC2 metadata directly, added icon, README, categories and fixed metadata.yaml
Description of the change
Charmworld reports the following errors:
err: Unknown root metadata field (ensemble)
warn: Metadata is missing categories.
warn: No icon.svg file.
warn: no README file
warn: (install:31) - hook accesses EC2 metadata service directly
Fixed all of them and added placeholder config.yaml and config-changed files, as charm proof was throwing errors.
- 14. By José Antonio Rey
-
Fixed errors
Cory Johns (johnsca) wrote : | # |
José,
Thank for your improvements to the byobu-classroom charm. The icon looks very nice, and the README is good, although it might also be nice if it included some more information about how to use it once started (e.g., the login information).
This is a good improvement to this charm, and I give it my +1.
Thanks again for all of your contributions.
Preview Diff
1 | === added file 'README.md' |
2 | --- README.md 1970-01-01 00:00:00 +0000 |
3 | +++ README.md 2014-04-08 00:50:29 +0000 |
4 | @@ -0,0 +1,29 @@ |
5 | +# Overview |
6 | + |
7 | +byobu-class provides remote terminal access through a web browser, using https, |
8 | +ajaxterm, and byobu. It operates in a one-writer, many reader mode. |
9 | + |
10 | +# Usage |
11 | + |
12 | +In order to deploy byobu-classroom, execute the following commands: |
13 | + |
14 | + juju bootstrap |
15 | + juju deploy byobu-classroom |
16 | + |
17 | +Then, expose the service by doing: |
18 | + |
19 | + juju expose byobu-classroom |
20 | + |
21 | +Once that's done, you can access the service at the public IP address/DNS given |
22 | +by: |
23 | + |
24 | + juju status |
25 | + |
26 | +# Configuration |
27 | + |
28 | +This charm has no configuration options. |
29 | + |
30 | +# Contact Information |
31 | + |
32 | +Maintainer: Mark Mims <mark.mims@canonical.com> |
33 | +Report bugs at: https://bugs.launchpad.net/charms/ |
34 | |
35 | === modified file 'hooks/install' |
36 | --- hooks/install 2011-11-09 19:24:24 +0000 |
37 | +++ hooks/install 2014-04-08 00:50:29 +0000 |
38 | @@ -28,7 +28,7 @@ |
39 | # Most web browsers can do a little better than 80x25; bump to 160x40 |
40 | sed -i -e "s/^width=.*/width=160;/" -e "s/^height=.*/height=40;/" /etc/ajaxterm.conf |
41 | service ajaxterm restart |
42 | -h=$(wget -q -O- http://169.254.169.254/latest/meta-data/public-hostname) || h=$(hostname -s) |
43 | +h=$(unit-get public-address) || h=$(hostname -s) |
44 | echo "<meta http-equiv='refresh' content='0;url=https://$h/'>" > /var/www/index.html |
45 | |
46 | sed -i -e "s/__HOSTNAME__/$h/" /var/www/index.html |
47 | |
48 | === added file 'icon.svg' |
49 | --- icon.svg 1970-01-01 00:00:00 +0000 |
50 | +++ icon.svg 2014-04-08 00:50:29 +0000 |
51 | @@ -0,0 +1,739 @@ |
52 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
53 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> |
54 | + |
55 | +<svg |
56 | + xmlns:dc="http://purl.org/dc/elements/1.1/" |
57 | + xmlns:cc="http://creativecommons.org/ns#" |
58 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
59 | + xmlns:svg="http://www.w3.org/2000/svg" |
60 | + xmlns="http://www.w3.org/2000/svg" |
61 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
62 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
63 | + width="96" |
64 | + height="96" |
65 | + id="svg6517" |
66 | + version="1.1" |
67 | + inkscape:version="0.48.4 r9939" |
68 | + sodipodi:docname="icon.svg"> |
69 | + <defs |
70 | + id="defs6519"> |
71 | + <linearGradient |
72 | + id="Background"> |
73 | + <stop |
74 | + id="stop4178" |
75 | + offset="0" |
76 | + style="stop-color:#b8b8b8;stop-opacity:1" /> |
77 | + <stop |
78 | + id="stop4180" |
79 | + offset="1" |
80 | + style="stop-color:#c9c9c9;stop-opacity:1" /> |
81 | + </linearGradient> |
82 | + <filter |
83 | + style="color-interpolation-filters:sRGB;" |
84 | + inkscape:label="Inner Shadow" |
85 | + id="filter1121"> |
86 | + <feFlood |
87 | + flood-opacity="0.59999999999999998" |
88 | + flood-color="rgb(0,0,0)" |
89 | + result="flood" |
90 | + id="feFlood1123" /> |
91 | + <feComposite |
92 | + in="flood" |
93 | + in2="SourceGraphic" |
94 | + operator="out" |
95 | + result="composite1" |
96 | + id="feComposite1125" /> |
97 | + <feGaussianBlur |
98 | + in="composite1" |
99 | + stdDeviation="1" |
100 | + result="blur" |
101 | + id="feGaussianBlur1127" /> |
102 | + <feOffset |
103 | + dx="0" |
104 | + dy="2" |
105 | + result="offset" |
106 | + id="feOffset1129" /> |
107 | + <feComposite |
108 | + in="offset" |
109 | + in2="SourceGraphic" |
110 | + operator="atop" |
111 | + result="composite2" |
112 | + id="feComposite1131" /> |
113 | + </filter> |
114 | + <filter |
115 | + style="color-interpolation-filters:sRGB;" |
116 | + inkscape:label="Drop Shadow" |
117 | + id="filter950"> |
118 | + <feFlood |
119 | + flood-opacity="0.50200803212851408" |
120 | + flood-color="rgb(0,0,0)" |
121 | + result="flood" |
122 | + id="feFlood952" /> |
123 | + <feComposite |
124 | + in="flood" |
125 | + in2="SourceGraphic" |
126 | + operator="in" |
127 | + result="composite1" |
128 | + id="feComposite954" /> |
129 | + <feGaussianBlur |
130 | + in="composite1" |
131 | + stdDeviation="1" |
132 | + result="blur" |
133 | + id="feGaussianBlur956" /> |
134 | + <feOffset |
135 | + dx="0" |
136 | + dy="1" |
137 | + result="offset" |
138 | + id="feOffset958" /> |
139 | + <feComposite |
140 | + in="SourceGraphic" |
141 | + in2="offset" |
142 | + operator="over" |
143 | + result="composite2" |
144 | + id="feComposite960" /> |
145 | + </filter> |
146 | + <clipPath |
147 | + clipPathUnits="userSpaceOnUse" |
148 | + id="clipPath873"> |
149 | + <g |
150 | + transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)" |
151 | + id="g875" |
152 | + inkscape:label="Layer 1" |
153 | + style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"> |
154 | + <path |
155 | + style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline" |
156 | + d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z" |
157 | + id="path877" |
158 | + inkscape:connector-curvature="0" |
159 | + sodipodi:nodetypes="sssssssss" /> |
160 | + </g> |
161 | + </clipPath> |
162 | + <filter |
163 | + inkscape:collect="always" |
164 | + id="filter891" |
165 | + inkscape:label="Badge Shadow"> |
166 | + <feGaussianBlur |
167 | + inkscape:collect="always" |
168 | + stdDeviation="0.71999962" |
169 | + id="feGaussianBlur893" /> |
170 | + </filter> |
171 | + </defs> |
172 | + <sodipodi:namedview |
173 | + id="base" |
174 | + pagecolor="#ffffff" |
175 | + bordercolor="#666666" |
176 | + borderopacity="1.0" |
177 | + inkscape:pageopacity="0.0" |
178 | + inkscape:pageshadow="2" |
179 | + inkscape:zoom="4.0745362" |
180 | + inkscape:cx="-42.228439" |
181 | + inkscape:cy="49.018169" |
182 | + inkscape:document-units="px" |
183 | + inkscape:current-layer="layer3" |
184 | + showgrid="true" |
185 | + fit-margin-top="0" |
186 | + fit-margin-left="0" |
187 | + fit-margin-right="0" |
188 | + fit-margin-bottom="0" |
189 | + inkscape:window-width="1920" |
190 | + inkscape:window-height="1056" |
191 | + inkscape:window-x="0" |
192 | + inkscape:window-y="24" |
193 | + inkscape:window-maximized="1" |
194 | + showborder="true" |
195 | + showguides="true" |
196 | + inkscape:guide-bbox="true" |
197 | + inkscape:showpageshadow="false"> |
198 | + <inkscape:grid |
199 | + type="xygrid" |
200 | + id="grid821" /> |
201 | + <sodipodi:guide |
202 | + orientation="1,0" |
203 | + position="16,48" |
204 | + id="guide823" /> |
205 | + <sodipodi:guide |
206 | + orientation="0,1" |
207 | + position="64,80" |
208 | + id="guide825" /> |
209 | + <sodipodi:guide |
210 | + orientation="1,0" |
211 | + position="80,40" |
212 | + id="guide827" /> |
213 | + <sodipodi:guide |
214 | + orientation="0,1" |
215 | + position="64,16" |
216 | + id="guide829" /> |
217 | + </sodipodi:namedview> |
218 | + <metadata |
219 | + id="metadata6522"> |
220 | + <rdf:RDF> |
221 | + <cc:Work |
222 | + rdf:about=""> |
223 | + <dc:format>image/svg+xml</dc:format> |
224 | + <dc:type |
225 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
226 | + <dc:title /> |
227 | + </cc:Work> |
228 | + </rdf:RDF> |
229 | + </metadata> |
230 | + <g |
231 | + inkscape:label="BACKGROUND" |
232 | + inkscape:groupmode="layer" |
233 | + id="layer1" |
234 | + transform="translate(268,-635.29076)" |
235 | + style="display:inline"> |
236 | + <path |
237 | + style="fill:#dd4814;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)" |
238 | + d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z" |
239 | + id="path6455" |
240 | + inkscape:connector-curvature="0" |
241 | + sodipodi:nodetypes="sssssssss" /> |
242 | + </g> |
243 | + <g |
244 | + inkscape:groupmode="layer" |
245 | + id="layer3" |
246 | + inkscape:label="PLACE YOUR PICTOGRAM HERE" |
247 | + style="display:inline"> |
248 | + <g |
249 | + id="g4037" |
250 | + transform="matrix(0.225,0,0,0.225,53.695707,38.281781)" |
251 | + style="filter:url(#filter950)"> |
252 | + <path |
253 | + id="path4136" |
254 | + d="m -163.55085,-90.527358 2.65153,272.015078" |
255 | + style="fill:#ffcca3;fill-opacity:0.75;stroke:#000000;stroke-width:0.64681846px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
256 | + inkscape:connector-curvature="0" /> |
257 | + <path |
258 | + id="path4158" |
259 | + d="m -164.21373,-89.917448 3.31441,272.624948 95.459729,-10.36829 88.8309,13.41779 86.179381,-6.09899 3.97729,-265.916068 -84.852941,-7.3188 -95.460389,14.0277 -97.44838,-10.36829 z" |
260 | + style="fill:none;stroke:#000000;stroke-width:0.64681846px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
261 | + inkscape:connector-curvature="0" /> |
262 | + <path |
263 | + id="path4162" |
264 | + d="m -66.76535,-79.549158 0,252.498278 0,0" |
265 | + style="fill:#ffcca3;fill-opacity:0.75;stroke:#000000;stroke-width:0.64681846px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
266 | + inkscape:connector-curvature="0" /> |
267 | + <path |
268 | + id="path4164" |
269 | + d="m 28.695039,-94.186748 0,278.723948" |
270 | + style="fill:#ffcca3;fill-opacity:0.15306121;stroke:#000000;stroke-width:0.64681846px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
271 | + inkscape:connector-curvature="0" /> |
272 | + <path |
273 | + id="path4166" |
274 | + d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z" |
275 | + style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none" |
276 | + inkscape:connector-curvature="0" /> |
277 | + <path |
278 | + id="path4168" |
279 | + d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z" |
280 | + style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none" |
281 | + inkscape:connector-curvature="0" /> |
282 | + <path |
283 | + id="path4170" |
284 | + d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z" |
285 | + style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none" |
286 | + inkscape:connector-curvature="0" /> |
287 | + <path |
288 | + id="path4172" |
289 | + d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z" |
290 | + style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none" |
291 | + inkscape:connector-curvature="0" /> |
292 | + <path |
293 | + id="path4176" |
294 | + d="m -20.642801,178.54423 c -22.78815,-3.46598 -42.4022,-6.46701 -43.58702,-6.66899 l -2.154529,-0.36718 0,-125.30664 c 0,-68.918668 0.22993,-125.306658 0.511159,-125.306658 0.28051,0 21.0281,-3.01901 46.10434,-6.70889 25.0768997,-3.6899 46.02681,-6.70889 46.55617,-6.70889 0.83888,0 0.96231,17.86713 0.96231,138.752058 l 0,138.75208 -3.4803,-0.0675 c -1.91381,-0.0372 -22.1246403,-2.90336 -44.91213,-6.36933 l 0,0 z" |
295 | + style="fill:#ffcca3;fill-opacity:0.15306121;stroke:none" |
296 | + inkscape:connector-curvature="0" /> |
297 | + <path |
298 | + id="path4178" |
299 | + d="m -20.642801,178.54423 c -22.78815,-3.46598 -42.4022,-6.46701 -43.58702,-6.66899 l -2.154529,-0.36718 0,-125.30664 c 0,-68.918668 0.22993,-125.306658 0.511159,-125.306658 0.28051,0 21.0281,-3.01901 46.10434,-6.70889 25.0768997,-3.6899 46.02681,-6.70889 46.55617,-6.70889 0.83888,0 0.96231,17.86713 0.96231,138.752058 l 0,138.75208 -3.4803,-0.0675 c -1.91381,-0.0372 -22.1246403,-2.90336 -44.91213,-6.36933 l 0,0 z" |
300 | + style="fill:#ffcca3;fill-opacity:0.15306121;stroke:none" |
301 | + inkscape:connector-curvature="0" /> |
302 | + <path |
303 | + id="path4180" |
304 | + d="m -20.642801,178.54423 c -22.78815,-3.46598 -42.4022,-6.46701 -43.58702,-6.66899 l -2.154529,-0.36718 0,-125.30664 c 0,-68.918668 0.22993,-125.306658 0.511159,-125.306658 0.28051,0 21.0281,-3.01901 46.10434,-6.70889 25.0768997,-3.6899 46.02681,-6.70889 46.55617,-6.70889 0.83888,0 0.96231,17.86713 0.96231,138.752058 l 0,138.75208 -3.4803,-0.0675 c -1.91381,-0.0372 -22.1246403,-2.90336 -44.91213,-6.36933 l 0,0 z" |
305 | + style="fill:#ffcca3;fill-opacity:0.15306121;stroke:none" |
306 | + inkscape:connector-curvature="0" /> |
307 | + <path |
308 | + id="path4182" |
309 | + d="m -20.642801,178.54423 c -22.78815,-3.46598 -42.4022,-6.46701 -43.58702,-6.66899 l -2.154529,-0.36718 0,-125.30664 c 0,-68.918668 0.22993,-125.306658 0.511159,-125.306658 0.28051,0 21.0281,-3.01901 46.10434,-6.70889 25.0768997,-3.6899 46.02681,-6.70889 46.55617,-6.70889 0.83888,0 0.96231,17.86713 0.96231,138.752058 l 0,138.75208 -3.4803,-0.0675 c -1.91381,-0.0372 -22.1246403,-2.90336 -44.91213,-6.36933 l 0,0 z" |
310 | + style="fill:#ffcca3;fill-opacity:0.15306121;stroke:none" |
311 | + inkscape:connector-curvature="0" /> |
312 | + <path |
313 | + id="path4184" |
314 | + d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z" |
315 | + style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none" |
316 | + inkscape:connector-curvature="0" /> |
317 | + <path |
318 | + id="path4186" |
319 | + d="m 29.076039,45.80486 0,-138.907298 1.82278,0.28888 c 1.00274,0.15888 19.71516,1.81543 41.58285,3.6812 21.86838,1.86578 39.894301,3.51561 40.058191,3.6663 0.53339,0.49112 -3.57137,263.626118 -4.12095,264.131558 -0.29333,0.27008 -18.265321,1.74107 -39.938131,3.26886 l -39.40474,2.77777 0,-138.90727 z" |
320 | + style="fill:#f4bd71;fill-opacity:0.11224491;stroke:none" |
321 | + inkscape:connector-curvature="0" /> |
322 | + <path |
323 | + id="path4700" |
324 | + d="m -20.642801,178.54423 c -22.78815,-3.46598 -42.4022,-6.46701 -43.58702,-6.66899 l -2.154529,-0.36718 0,-125.30664 c 0,-68.918668 0.22993,-125.306658 0.511159,-125.306658 0.28051,0 21.0281,-3.01901 46.10434,-6.70889 25.0768997,-3.6899 46.02681,-6.70889 46.55617,-6.70889 0.83888,0 0.96231,17.86713 0.96231,138.752058 l 0,138.75208 -3.4803,-0.0675 c -1.91381,-0.0372 -22.1246403,-2.90336 -44.91213,-6.36933 l 0,0 z" |
325 | + style="fill:#ffcca3;fill-opacity:0.19607843;stroke:#000000;stroke-width:6.46818447;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
326 | + inkscape:connector-curvature="0" /> |
327 | + <path |
328 | + id="path4702" |
329 | + d="m -160.57158,157.38319 c -0.027,-13.50164 -0.56511,-74.36198 -1.19023,-135.24516 -0.62579,-60.883188 -1.04321,-110.816618 -0.9279,-110.963168 0.17399,-0.22169 71.495496,7.14453 89.51065,9.24487 l 5.46895,0.63762 0,125.557948 c 0,108.87053 -0.12679,125.55793 -0.95421,125.55793 -0.52532,0 -21.14546,2.19564 -45.82247,4.87921 -24.67769,2.68354 -45.12992,4.87919 -45.44956,4.87919 -0.32369,0 -0.60556,-10.9082 -0.63523,-24.54844 l 0,0 z" |
330 | + style="fill:#ffcca3;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.46818447;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
331 | + inkscape:connector-curvature="0" /> |
332 | + <path |
333 | + id="path6195" |
334 | + d="M 82.391179,174.16891 26.042849,126.59677 -8.4283713,110.1295 -28.316181,68.04644 l -33.80834,-31.10485 -0.66287,-18.29698 11.26901,-43.912738" |
335 | + style="fill:none;stroke:#000000;stroke-width:5.82136583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.68627451;stroke-dasharray:none" |
336 | + inkscape:connector-curvature="0" /> |
337 | + <path |
338 | + id="path6197" |
339 | + d="M 23.391309,124.15717 76.424579,97.9315" |
340 | + style="fill:none;stroke:#000000;stroke-width:5.17454767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none" |
341 | + inkscape:connector-curvature="0" /> |
342 | + <path |
343 | + id="path6199" |
344 | + d="M 14.110959,119.27797 57.200319,82.68404" |
345 | + style="fill:none;stroke:#000000;stroke-width:5.17454767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none" |
346 | + inkscape:connector-curvature="0" /> |
347 | + <path |
348 | + id="path6201" |
349 | + d="M 2.1784087,114.3988 -34.944991,140.62445" |
350 | + style="fill:none;stroke:#000000;stroke-width:3.23409224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none" |
351 | + inkscape:connector-curvature="0" /> |
352 | + <path |
353 | + id="path6203" |
354 | + d="m -10.611901,102.90693 -40.68935,18.63143 -24.412678,-20.37814 -65.103371,4.07564" |
355 | + style="fill:none;stroke:#000000;stroke-width:4.90143967;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.68627451;stroke-dasharray:none" |
356 | + inkscape:connector-curvature="0" /> |
357 | + <path |
358 | + id="path6205" |
359 | + d="M -29.641941,65.60686 0.8519787,29.01291 59.851849,-10.630558 l 20.55068,-3.04948 0.66289,0" |
360 | + style="fill:none;stroke:#000000;stroke-width:5.17454767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.68627451;stroke-dasharray:none" |
361 | + inkscape:connector-curvature="0" /> |
362 | + <path |
363 | + id="path6207" |
364 | + d="M -13.732101,45.48018 -20.360931,19.86442 8.8072187,4.007032" |
365 | + style="fill:none;stroke:#000000;stroke-width:4.52772903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none" |
366 | + inkscape:connector-curvature="0" /> |
367 | + <path |
368 | + id="path6209" |
369 | + d="m -3.7882113,11.32581 -0.66287,-26.835548 18.5620403,1.21979 53.03327,-45.74245" |
370 | + style="fill:none;stroke:#000000;stroke-width:3.23409224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none" |
371 | + inkscape:connector-curvature="0" /> |
372 | + <path |
373 | + id="path6211" |
374 | + d="m -62.787391,21.08421 31.81969,-29.275148" |
375 | + style="fill:none;stroke:#000000;stroke-width:3.23409224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none" |
376 | + inkscape:connector-curvature="0" /> |
377 | + <path |
378 | + id="path6213" |
379 | + d="M -63.450291,26.57331 -91.956224,37.5515 -125.10167,11.32581 -137.03422,9.49612" |
380 | + style="fill:none;stroke:#000000;stroke-width:4.52772903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.68627451;stroke-dasharray:none" |
381 | + inkscape:connector-curvature="0" /> |
382 | + <path |
383 | + id="path6215" |
384 | + d="m -61.461631,13.15554 -45.741549,-24.395998 -27.84239,1.21981 4.64017,-20.73657" |
385 | + style="fill:none;stroke:#000000;stroke-width:3.23409224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.58823529;stroke-dasharray:none" |
386 | + inkscape:connector-curvature="0" /> |
387 | + <path |
388 | + transform="matrix(0.67434588,0,0,0.62041473,-11432.465,-103.94514)" |
389 | + d="m 17097.22,140.57626 c 0,5.42924 -4.181,9.83051 -9.339,9.83051 -5.158,0 -9.339,-4.40127 -9.339,-9.83051 0,-5.42924 4.181,-9.8305 9.339,-9.8305 5.158,0 9.339,4.40126 9.339,9.8305 z" |
390 | + sodipodi:ry="9.8305082" |
391 | + sodipodi:rx="9.3389826" |
392 | + sodipodi:cy="140.57626" |
393 | + sodipodi:cx="17087.881" |
394 | + id="path6251" |
395 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
396 | + sodipodi:type="arc" /> |
397 | + <path |
398 | + transform="matrix(0.67434588,0,0,0.62041473,-11419.206,-105.77482)" |
399 | + d="m 17064.78,167.61017 c 0,4.61485 -3.081,8.35593 -6.882,8.35593 -3.8,0 -6.881,-3.74108 -6.881,-8.35593 0,-4.61486 3.081,-8.35593 6.881,-8.35593 3.801,0 6.882,3.74107 6.882,8.35593 z" |
400 | + sodipodi:ry="8.3559322" |
401 | + sodipodi:rx="6.8813558" |
402 | + sodipodi:cy="167.61017" |
403 | + sodipodi:cx="17057.898" |
404 | + id="path6253" |
405 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
406 | + sodipodi:type="arc" /> |
407 | + <path |
408 | + transform="matrix(0.67434588,0,0,0.62041473,-11416.555,-116.75303)" |
409 | + d="m 17046.101,147.45763 c 0,5.97216 -5.281,10.81356 -11.796,10.81356 -6.515,0 -11.797,-4.8414 -11.797,-10.81356 0,-5.97217 5.282,-10.81356 11.797,-10.81356 6.515,0 11.796,4.84139 11.796,10.81356 z" |
410 | + sodipodi:ry="10.81356" |
411 | + sodipodi:rx="11.79661" |
412 | + sodipodi:cy="147.45763" |
413 | + sodipodi:cx="17034.305" |
414 | + id="path6255" |
415 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
416 | + sodipodi:type="arc" /> |
417 | + <path |
418 | + transform="matrix(0.67434588,0,0,0.62041473,-11437.769,-116.75303)" |
419 | + d="m 17067.729,110.10169 c 0,4.88632 -3.081,8.84746 -6.881,8.84746 -3.801,0 -6.882,-3.96114 -6.882,-8.84746 0,-4.88631 3.081,-8.84746 6.882,-8.84746 3.8,0 6.881,3.96115 6.881,8.84746 z" |
420 | + sodipodi:ry="8.8474579" |
421 | + sodipodi:rx="6.8813558" |
422 | + sodipodi:cy="110.10169" |
423 | + sodipodi:cx="17060.848" |
424 | + id="path6257" |
425 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
426 | + sodipodi:type="arc" /> |
427 | + <path |
428 | + transform="matrix(0.67434588,0,0,0.62041473,-11428.488,-125.90151)" |
429 | + d="m 17030.373,110.10169 c 0,5.42924 -4.622,9.83051 -10.322,9.83051 -5.701,0 -10.322,-4.40127 -10.322,-9.83051 0,-5.42924 4.621,-9.83051 10.322,-9.83051 5.7,0 10.322,4.40127 10.322,9.83051 z" |
430 | + sodipodi:ry="9.8305082" |
431 | + sodipodi:rx="10.322034" |
432 | + sodipodi:cy="110.10169" |
433 | + sodipodi:cx="17020.051" |
434 | + id="path6259" |
435 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
436 | + sodipodi:type="arc" /> |
437 | + <path |
438 | + transform="matrix(0.67434588,0,0,0.62041473,-11421.196,-67.351178)" |
439 | + d="m 17026.44,256.57626 c 0,2.71462 -2.421,4.91526 -5.407,4.91526 -2.986,0 -5.407,-2.20064 -5.407,-4.91526 0,-2.71462 2.421,-4.91525 5.407,-4.91525 2.986,0 5.407,2.20063 5.407,4.91525 z" |
440 | + sodipodi:ry="4.9152541" |
441 | + sodipodi:rx="5.4067798" |
442 | + sodipodi:cy="256.57626" |
443 | + sodipodi:cx="17021.033" |
444 | + id="path6261" |
445 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
446 | + sodipodi:type="arc" /> |
447 | + <path |
448 | + transform="matrix(0.67434588,0,0,0.62041473,-11421.196,-101.50553)" |
449 | + d="m 17037.254,282.62711 c 0,5.15777 -4.622,9.33898 -10.322,9.33898 -5.701,0 -10.322,-4.18121 -10.322,-9.33898 0,-5.15778 4.621,-9.33899 10.322,-9.33899 5.7,0 10.322,4.18121 10.322,9.33899 z" |
450 | + sodipodi:ry="9.3389826" |
451 | + sodipodi:rx="10.322034" |
452 | + sodipodi:cy="282.62711" |
453 | + sodipodi:cx="17026.932" |
454 | + id="path6263" |
455 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
456 | + sodipodi:type="arc" /> |
457 | + <path |
458 | + transform="matrix(0.67434588,0,0,0.62041473,-11446.388,-111.87383)" |
459 | + d="m 17051.016,307.2034 c 0,5.7007 -4.401,10.32203 -9.83,10.32203 -5.43,0 -9.831,-4.62133 -9.831,-10.32203 0,-5.7007 4.401,-10.32203 9.831,-10.32203 5.429,0 9.83,4.62133 9.83,10.32203 z" |
460 | + sodipodi:ry="10.322034" |
461 | + sodipodi:rx="9.8305082" |
462 | + sodipodi:cy="307.2034" |
463 | + sodipodi:cx="17041.186" |
464 | + id="path6265" |
465 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
466 | + sodipodi:type="arc" /> |
467 | + <path |
468 | + transform="matrix(0.67434588,0,0,0.62041473,-11428.488,-105.77482)" |
469 | + d="m 17088.373,335.71185 c 0,4.61486 -5.282,8.35594 -11.797,8.35594 -6.515,0 -11.796,-3.74108 -11.796,-8.35594 0,-4.61485 5.281,-8.35593 11.796,-8.35593 6.515,0 11.797,3.74108 11.797,8.35593 z" |
470 | + sodipodi:ry="8.3559322" |
471 | + sodipodi:rx="11.79661" |
472 | + sodipodi:cy="335.71185" |
473 | + sodipodi:cx="17076.576" |
474 | + id="path6267" |
475 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
476 | + sodipodi:type="arc" /> |
477 | + <path |
478 | + transform="matrix(0.67434588,0,0,0.62041473,-11471.577,-213.727)" |
479 | + d="m 17035.288,360.77966 c 0,2.1717 -2.421,3.93221 -5.407,3.93221 -2.986,0 -5.407,-1.76051 -5.407,-3.93221 0,-2.17169 2.421,-3.9322 5.407,-3.9322 2.986,0 5.407,1.76051 5.407,3.9322 z" |
480 | + sodipodi:ry="3.9322033" |
481 | + sodipodi:rx="5.4067798" |
482 | + sodipodi:cy="360.77966" |
483 | + sodipodi:cx="17029.881" |
484 | + id="path6269" |
485 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
486 | + sodipodi:type="arc" /> |
487 | + <path |
488 | + transform="matrix(0.67434588,0,0,0.62041473,-11418.543,-109.43424)" |
489 | + d="m 17051.016,354.88135 c 0,3.80047 -3.741,6.88135 -8.356,6.88135 -4.615,0 -8.356,-3.08088 -8.356,-6.88135 0,-3.80047 3.741,-6.88136 8.356,-6.88136 4.615,0 8.356,3.08089 8.356,6.88136 z" |
490 | + sodipodi:ry="6.8813558" |
491 | + sodipodi:rx="8.3559322" |
492 | + sodipodi:cy="354.88135" |
493 | + sodipodi:cx="17042.66" |
494 | + id="path6271" |
495 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
496 | + sodipodi:type="arc" /> |
497 | + <path |
498 | + transform="matrix(0.67434588,0,0,0.62041473,-11435.778,-124.0718)" |
499 | + d="m 16905.525,414.35593 c 0,5.15777 -4.182,9.33898 -9.339,9.33898 -5.158,0 -9.339,-4.18121 -9.339,-9.33898 0,-5.15778 4.181,-9.33899 9.339,-9.33899 5.157,0 9.339,4.18121 9.339,9.33899 z" |
500 | + sodipodi:ry="9.3389826" |
501 | + sodipodi:rx="9.3389826" |
502 | + sodipodi:cy="414.35593" |
503 | + sodipodi:cx="16896.186" |
504 | + id="path6273" |
505 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
506 | + sodipodi:type="arc" /> |
507 | + <path |
508 | + transform="matrix(0.67434588,0,0,0.62041473,-11459.646,-64.301688)" |
509 | + d="m 16959.592,339.15256 c 0,5.42924 -2.42,9.83051 -5.406,9.83051 -2.987,0 -5.407,-4.40127 -5.407,-9.83051 0,-5.42924 2.42,-9.83051 5.407,-9.83051 2.986,0 5.406,4.40127 5.406,9.83051 z" |
510 | + sodipodi:ry="9.8305082" |
511 | + sodipodi:rx="5.4067798" |
512 | + sodipodi:cy="339.15256" |
513 | + sodipodi:cx="16954.186" |
514 | + id="path6275" |
515 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
516 | + sodipodi:type="arc" /> |
517 | + <path |
518 | + transform="matrix(0.67434588,0,0,0.62041473,-11341.645,-277.76641)" |
519 | + d="m 16923.22,338.66101 c 0,4.07193 -4.181,7.37288 -9.339,7.37288 -5.158,0 -9.339,-3.30095 -9.339,-7.37288 0,-4.07193 4.181,-7.37288 9.339,-7.37288 5.158,0 9.339,3.30095 9.339,7.37288 z" |
520 | + sodipodi:ry="7.3728814" |
521 | + sodipodi:rx="9.3389826" |
522 | + sodipodi:cy="338.66101" |
523 | + sodipodi:cx="16913.881" |
524 | + id="path6277" |
525 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
526 | + sodipodi:type="arc" /> |
527 | + <path |
528 | + transform="matrix(0.67434588,0,0,0.62041473,-11457.656,-195.43002)" |
529 | + d="m 16962.541,287.54236 c 0,5.15778 -3.741,9.33898 -8.355,9.33898 -4.615,0 -8.356,-4.1812 -8.356,-9.33898 0,-5.15778 3.741,-9.33898 8.356,-9.33898 4.614,0 8.355,4.1812 8.355,9.33898 z" |
530 | + sodipodi:ry="9.3389826" |
531 | + sodipodi:rx="8.3559322" |
532 | + sodipodi:cy="287.54236" |
533 | + sodipodi:cx="16954.186" |
534 | + id="path6279" |
535 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
536 | + sodipodi:type="arc" /> |
537 | + <path |
538 | + transform="matrix(0.67434588,0,0,0.62041473,-11405.286,-166.15485)" |
539 | + d="m 16931.084,260.01694 c 0,5.15777 -3.301,9.33898 -7.373,9.33898 -4.072,0 -7.373,-4.18121 -7.373,-9.33898 0,-5.15778 3.301,-9.33899 7.373,-9.33899 4.072,0 7.373,4.18121 7.373,9.33899 z" |
540 | + sodipodi:ry="9.3389826" |
541 | + sodipodi:rx="7.3728814" |
542 | + sodipodi:cy="260.01694" |
543 | + sodipodi:cx="16923.711" |
544 | + id="path6281" |
545 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
546 | + sodipodi:type="arc" /> |
547 | + <path |
548 | + transform="matrix(0.67434588,0,0,0.62041473,-11432.465,-134.44009)" |
549 | + d="m 16927.152,211.35593 c 0,4.34339 -3.961,7.8644 -8.847,7.8644 -4.887,0 -8.848,-3.52101 -8.848,-7.8644 0,-4.3434 3.961,-7.86441 8.848,-7.86441 4.886,0 8.847,3.52101 8.847,7.86441 z" |
550 | + sodipodi:ry="7.8644066" |
551 | + sodipodi:rx="8.8474579" |
552 | + sodipodi:cy="211.35593" |
553 | + sodipodi:cx="16918.305" |
554 | + id="path6283" |
555 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
556 | + sodipodi:type="arc" /> |
557 | + <path |
558 | + transform="matrix(0.33717295,0,0,0.74449769,-5751.2721,-133.09832)" |
559 | + d="m 16904.543,131.72882 c 0,5.42924 -5.721,9.83051 -12.779,9.83051 -7.058,0 -12.78,-4.40127 -12.78,-9.83051 0,-5.42924 5.722,-9.83051 12.78,-9.83051 7.058,0 12.779,4.40127 12.779,9.83051 z" |
560 | + sodipodi:ry="9.8305082" |
561 | + sodipodi:rx="12.779661" |
562 | + sodipodi:cy="131.72882" |
563 | + sodipodi:cx="16891.764" |
564 | + id="path6287" |
565 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
566 | + sodipodi:type="arc" /> |
567 | + <path |
568 | + transform="matrix(0.67434588,0,0,0.62041473,-11443.735,-109.43424)" |
569 | + d="m 16769.864,129.27118 c 0,7.32947 -4.402,13.27119 -9.831,13.27119 -5.429,0 -9.83,-5.94172 -9.83,-13.27119 0,-7.32947 4.401,-13.27119 9.83,-13.27119 5.429,0 9.831,5.94172 9.831,13.27119 z" |
570 | + sodipodi:ry="13.271187" |
571 | + sodipodi:rx="9.8305082" |
572 | + sodipodi:cy="129.27118" |
573 | + sodipodi:cx="16760.033" |
574 | + id="path6289" |
575 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
576 | + sodipodi:type="arc" /> |
577 | + <path |
578 | + transform="matrix(0.58443311,0,0,0.39706542,-9951.2887,-74.352818)" |
579 | + d="m 16820,191.20338 c 0,6.78655 -6.602,12.28814 -14.746,12.28814 -8.144,0 -14.746,-5.50159 -14.746,-12.28814 0,-6.78655 6.602,-12.28813 14.746,-12.28813 8.144,0 14.746,5.50158 14.746,12.28813 z" |
580 | + sodipodi:ry="12.288136" |
581 | + sodipodi:rx="14.745763" |
582 | + sodipodi:cy="191.20338" |
583 | + sodipodi:cx="16805.254" |
584 | + id="path6291" |
585 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
586 | + sodipodi:type="arc" /> |
587 | + <path |
588 | + transform="matrix(0.67434588,0,0,0.62041473,-11438.432,-116.14312)" |
589 | + d="m 16774.78,220.69492 c 0,5.7007 -5.501,10.32203 -12.288,10.32203 -6.786,0 -12.288,-4.62133 -12.288,-10.32203 0,-5.70071 5.502,-10.32204 12.288,-10.32204 6.787,0 12.288,4.62133 12.288,10.32204 z" |
590 | + sodipodi:ry="10.322034" |
591 | + sodipodi:rx="12.288136" |
592 | + sodipodi:cy="220.69492" |
593 | + sodipodi:cx="16762.492" |
594 | + id="path6293" |
595 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
596 | + sodipodi:type="arc" /> |
597 | + <path |
598 | + transform="matrix(0.67434588,0,0,0.62041473,-11474.228,-232.63387)" |
599 | + d="m 16826.881,308.67798 c 0,3.80047 -3.961,6.88135 -8.848,6.88135 -4.886,0 -8.847,-3.08088 -8.847,-6.88135 0,-3.80047 3.961,-6.88136 8.847,-6.88136 4.887,0 8.848,3.08089 8.848,6.88136 z" |
600 | + sodipodi:ry="6.8813558" |
601 | + sodipodi:rx="8.8474579" |
602 | + sodipodi:cy="308.67798" |
603 | + sodipodi:cx="16818.033" |
604 | + id="path6295" |
605 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
606 | + sodipodi:type="arc" /> |
607 | + <path |
608 | + transform="matrix(0.67434588,0,0,0.62041473,-11494.779,-197.86962)" |
609 | + d="m 16837.695,331.28815 c 0,5.42924 -2.861,9.83051 -6.39,9.83051 -3.529,0 -6.39,-4.40127 -6.39,-9.83051 0,-5.42924 2.861,-9.83051 6.39,-9.83051 3.529,0 6.39,4.40127 6.39,9.83051 z" |
610 | + sodipodi:ry="9.8305082" |
611 | + sodipodi:rx="6.3898306" |
612 | + sodipodi:cy="331.28815" |
613 | + sodipodi:cx="16831.305" |
614 | + id="path6297" |
615 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
616 | + sodipodi:type="arc" /> |
617 | + <path |
618 | + transform="matrix(0.67434588,0,0,0.62041473,-11319.768,-235.07347)" |
619 | + d="m 16817.05,382.89832 c 0,3.529 -2.861,6.38983 -6.39,6.38983 -3.529,0 -6.39,-2.86083 -6.39,-6.38983 0,-3.52901 2.861,-6.38984 6.39,-6.38984 3.529,0 6.39,2.86083 6.39,6.38984 z" |
620 | + sodipodi:ry="6.3898306" |
621 | + sodipodi:rx="6.3898306" |
622 | + sodipodi:cy="382.89832" |
623 | + sodipodi:cx="16810.66" |
624 | + id="path6299" |
625 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
626 | + sodipodi:type="arc" /> |
627 | + <path |
628 | + transform="matrix(0.67434588,0,0,0.62041473,-11496.105,-131.39059)" |
629 | + d="m 16835.728,393.71185 c 0,4.61486 -3.961,8.35594 -8.847,8.35594 -4.886,0 -8.848,-3.74108 -8.848,-8.35594 0,-4.61485 3.962,-8.35593 8.848,-8.35593 4.886,0 8.847,3.74108 8.847,8.35593 z" |
630 | + sodipodi:ry="8.3559322" |
631 | + sodipodi:rx="8.8474579" |
632 | + sodipodi:cy="393.71185" |
633 | + sodipodi:cx="16826.881" |
634 | + id="path6311" |
635 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
636 | + sodipodi:type="arc" /> |
637 | + <path |
638 | + transform="matrix(0.32933172,0,0,0.41360982,-5655.0571,-44.378318)" |
639 | + d="m 16793.458,385.35593 c 0,6.51508 -9.463,11.79661 -21.136,11.79661 -11.673,0 -21.135,-5.28153 -21.135,-11.79661 0,-6.51509 9.462,-11.79661 21.135,-11.79661 11.673,0 21.136,5.28152 21.136,11.79661 z" |
640 | + sodipodi:ry="11.79661" |
641 | + sodipodi:rx="21.135593" |
642 | + sodipodi:cy="385.35593" |
643 | + sodipodi:cx="16772.322" |
644 | + id="path6313" |
645 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
646 | + sodipodi:type="arc" /> |
647 | + <path |
648 | + transform="matrix(0.67434588,0,0,0.62041473,-11460.307,-121.02232)" |
649 | + d="m 16796.407,348.98306 c 0,4.34339 -4.402,7.86441 -9.831,7.86441 -5.429,0 -9.83,-3.52102 -9.83,-7.86441 0,-4.34339 4.401,-7.8644 9.83,-7.8644 5.429,0 9.831,3.52101 9.831,7.8644 z" |
650 | + sodipodi:ry="7.8644066" |
651 | + sodipodi:rx="9.8305082" |
652 | + sodipodi:cy="348.98306" |
653 | + sodipodi:cx="16786.576" |
654 | + id="path6315" |
655 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
656 | + sodipodi:type="arc" /> |
657 | + <path |
658 | + transform="matrix(0.67434588,0,0,0.62041473,-11371.478,-232.63387)" |
659 | + d="m 16805.255,333.74576 c 0,4.07193 -2.861,7.37288 -6.39,7.37288 -3.529,0 -6.39,-3.30095 -6.39,-7.37288 0,-4.07193 2.861,-7.37288 6.39,-7.37288 3.529,0 6.39,3.30095 6.39,7.37288 z" |
660 | + sodipodi:ry="7.3728814" |
661 | + sodipodi:rx="6.3898306" |
662 | + sodipodi:cy="333.74576" |
663 | + sodipodi:cx="16798.865" |
664 | + id="path6317" |
665 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
666 | + sodipodi:type="arc" /> |
667 | + <path |
668 | + transform="matrix(0.77068099,0,0,0.50408697,-12961.624,-208.50473)" |
669 | + d="m 16774.779,341.11865 c 0,4.34339 -4.621,7.86441 -10.322,7.86441 -5.701,0 -10.322,-3.52102 -10.322,-7.86441 0,-4.34339 4.621,-7.8644 10.322,-7.8644 5.701,0 10.322,3.52101 10.322,7.8644 z" |
670 | + sodipodi:ry="7.8644066" |
671 | + sodipodi:rx="10.322034" |
672 | + sodipodi:cy="341.11865" |
673 | + sodipodi:cx="16764.457" |
674 | + id="path6323" |
675 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
676 | + sodipodi:type="arc" /> |
677 | + <path |
678 | + transform="matrix(0.67434588,0,0,0.62041473,-11425.836,-191.16073)" |
679 | + d="m 16895.696,284.10168 c 0,4.3434 -3.081,7.86441 -6.882,7.86441 -3.8,0 -6.881,-3.52101 -6.881,-7.86441 0,-4.34339 3.081,-7.8644 6.881,-7.8644 3.801,0 6.882,3.52101 6.882,7.8644 z" |
680 | + sodipodi:ry="7.8644066" |
681 | + sodipodi:rx="6.8813558" |
682 | + sodipodi:cy="284.10168" |
683 | + sodipodi:cx="16888.814" |
684 | + id="path6325" |
685 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
686 | + sodipodi:type="arc" /> |
687 | + <path |
688 | + transform="matrix(0.67434588,0,0,0.62041473,-11437.104,-94.796648)" |
689 | + d="m 17088.373,290 c 0,8.14386 -5.061,14.74576 -11.305,14.74576 -6.243,0 -11.305,-6.6019 -11.305,-14.74576 0,-8.14386 5.062,-14.74576 11.305,-14.74576 6.244,0 11.305,6.6019 11.305,14.74576 z" |
690 | + sodipodi:ry="14.745763" |
691 | + sodipodi:rx="11.305085" |
692 | + sodipodi:cy="290" |
693 | + sodipodi:cx="17077.068" |
694 | + id="path6327" |
695 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
696 | + sodipodi:type="arc" /> |
697 | + <path |
698 | + transform="matrix(0.67434588,0,0,0.62041473,-11466.274,-124.6817)" |
699 | + d="m 16837.695,146.96609 c 0,4.07193 -5.281,7.37289 -11.797,7.37289 -6.515,0 -11.796,-3.30096 -11.796,-7.37289 0,-4.07192 5.281,-7.37288 11.796,-7.37288 6.516,0 11.797,3.30096 11.797,7.37288 z" |
700 | + sodipodi:ry="7.3728814" |
701 | + sodipodi:rx="11.79661" |
702 | + sodipodi:cy="146.96609" |
703 | + sodipodi:cx="16825.898" |
704 | + id="path6329" |
705 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
706 | + sodipodi:type="arc" /> |
707 | + <path |
708 | + transform="matrix(0.67434588,0,0,0.62041473,-11460.97,-108.82431)" |
709 | + d="m 16945.831,414.35593 c 0,3.529 -3.521,6.38983 -7.864,6.38983 -4.344,0 -7.865,-2.86083 -7.865,-6.38983 0,-3.52901 3.521,-6.38983 7.865,-6.38983 4.343,0 7.864,2.86082 7.864,6.38983 z" |
710 | + sodipodi:ry="6.3898306" |
711 | + sodipodi:rx="7.8644066" |
712 | + sodipodi:cy="414.35593" |
713 | + sodipodi:cx="16937.967" |
714 | + id="path6331" |
715 | + style="fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none" |
716 | + sodipodi:type="arc" /> |
717 | + </g> |
718 | + </g> |
719 | + <g |
720 | + inkscape:groupmode="layer" |
721 | + id="layer2" |
722 | + inkscape:label="BADGE" |
723 | + style="display:none" |
724 | + sodipodi:insensitive="true"> |
725 | + <g |
726 | + style="display:inline" |
727 | + transform="translate(-340.00001,-581)" |
728 | + id="g4394" |
729 | + clip-path="none"> |
730 | + <g |
731 | + id="g855"> |
732 | + <g |
733 | + inkscape:groupmode="maskhelper" |
734 | + id="g870" |
735 | + clip-path="url(#clipPath873)" |
736 | + style="opacity:0.6;filter:url(#filter891)"> |
737 | + <path |
738 | + transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)" |
739 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
740 | + sodipodi:ry="12" |
741 | + sodipodi:rx="12" |
742 | + sodipodi:cy="552.36218" |
743 | + sodipodi:cx="252" |
744 | + id="path844" |
745 | + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
746 | + sodipodi:type="arc" /> |
747 | + </g> |
748 | + <g |
749 | + id="g862"> |
750 | + <path |
751 | + sodipodi:type="arc" |
752 | + style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
753 | + id="path4398" |
754 | + sodipodi:cx="252" |
755 | + sodipodi:cy="552.36218" |
756 | + sodipodi:rx="12" |
757 | + sodipodi:ry="12" |
758 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
759 | + transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" /> |
760 | + <path |
761 | + transform="matrix(1.25,0,0,1.25,33,-100.45273)" |
762 | + d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" |
763 | + sodipodi:ry="12" |
764 | + sodipodi:rx="12" |
765 | + sodipodi:cy="552.36218" |
766 | + sodipodi:cx="252" |
767 | + id="path4400" |
768 | + style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
769 | + sodipodi:type="arc" /> |
770 | + <path |
771 | + sodipodi:type="star" |
772 | + style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
773 | + id="path4459" |
774 | + sodipodi:sides="5" |
775 | + sodipodi:cx="666.19574" |
776 | + sodipodi:cy="589.50385" |
777 | + sodipodi:r1="7.2431178" |
778 | + sodipodi:r2="4.3458705" |
779 | + sodipodi:arg1="1.0471976" |
780 | + sodipodi:arg2="1.6755161" |
781 | + inkscape:flatsided="false" |
782 | + inkscape:rounded="0.1" |
783 | + inkscape:randomized="0" |
784 | + d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z" |
785 | + transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" /> |
786 | + </g> |
787 | + </g> |
788 | + </g> |
789 | + </g> |
790 | +</svg> |
791 | |
792 | === modified file 'metadata.yaml' |
793 | --- metadata.yaml 2012-07-23 22:32:05 +0000 |
794 | +++ metadata.yaml 2014-04-08 00:50:29 +0000 |
795 | @@ -1,4 +1,3 @@ |
796 | -ensemble: formula |
797 | name: byobu-classroom |
798 | summary: "Remote terminal classroom over https" |
799 | description: | |
800 | @@ -6,6 +5,8 @@ |
801 | using https, ajaxterm, and byobu. It operates in a one-writer, |
802 | many reader mode. |
803 | maintainer: Mark Mims <mark.mims@canonical.com> |
804 | +categories: |
805 | + - applications |
806 | provides: |
807 | website: |
808 | interface: https |
Please do not create "empty" hooks or config.yaml files. "I" (INFO) proof lines aren't errors, but informational. I have to reject this merge on that alone. The rest of the merge looks good, though the README seems a bit lite (though, a readme is better than none).
When ready for another review please make sure to "Request another review" from "charmers". Thanks for all your work!