Commit ee1a7bce29f5f0b8e068cba1db5421b9d9af3272
Exists in
master
and in
29 other branches
Merge commit 'refs/merge-requests/102' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/102 Removed changes of noosfero.po
Showing
14 changed files
with
383 additions
and
151 deletions
Show diff stats
plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb
| @@ -118,7 +118,7 @@ class ShoppingCartPluginProfileController < ProfileController | @@ -118,7 +118,7 @@ class ShoppingCartPluginProfileController < ProfileController | ||
| 118 | session[:cart][:visibility] = true | 118 | session[:cart][:visibility] = true |
| 119 | render :text => { | 119 | render :text => { |
| 120 | :ok => true, | 120 | :ok => true, |
| 121 | - :message => _('Cart displayed.'), | 121 | + :message => _('Basket displayed.'), |
| 122 | :error => {:code => 0} | 122 | :error => {:code => 0} |
| 123 | }.to_json | 123 | }.to_json |
| 124 | rescue Exception => exception | 124 | rescue Exception => exception |
| @@ -137,7 +137,7 @@ class ShoppingCartPluginProfileController < ProfileController | @@ -137,7 +137,7 @@ class ShoppingCartPluginProfileController < ProfileController | ||
| 137 | session[:cart][:visibility] = false | 137 | session[:cart][:visibility] = false |
| 138 | render :text => { | 138 | render :text => { |
| 139 | :ok => true, | 139 | :ok => true, |
| 140 | - :message => _('Cart Hidden.'), | 140 | + :message => _('Basket hidden.'), |
| 141 | :error => {:code => 0} | 141 | :error => {:code => 0} |
| 142 | }.to_json | 142 | }.to_json |
| 143 | rescue Exception => exception | 143 | rescue Exception => exception |
| @@ -173,7 +173,7 @@ class ShoppingCartPluginProfileController < ProfileController | @@ -173,7 +173,7 @@ class ShoppingCartPluginProfileController < ProfileController | ||
| 173 | :ok => false, | 173 | :ok => false, |
| 174 | :error => { | 174 | :error => { |
| 175 | :code => 2, | 175 | :code => 2, |
| 176 | - :message => _("There is no cart.") | 176 | + :message => _("There is no basket.") |
| 177 | } | 177 | } |
| 178 | }.to_json | 178 | }.to_json |
| 179 | return false | 179 | return false |
| @@ -203,7 +203,7 @@ class ShoppingCartPluginProfileController < ProfileController | @@ -203,7 +203,7 @@ class ShoppingCartPluginProfileController < ProfileController | ||
| 203 | :ok => false, | 203 | :ok => false, |
| 204 | :error => { | 204 | :error => { |
| 205 | :code => 4, | 205 | :code => 4, |
| 206 | - :message => _("The cart doesn't have this product.") | 206 | + :message => _("The basket doesn't have this product.") |
| 207 | } | 207 | } |
| 208 | }.to_json | 208 | }.to_json |
| 209 | return false | 209 | return false |
plugins/shopping_cart/lib/shopping_cart_plugin.rb
| @@ -4,17 +4,17 @@ require_dependency 'ext/person' | @@ -4,17 +4,17 @@ require_dependency 'ext/person' | ||
| 4 | class ShoppingCartPlugin < Noosfero::Plugin | 4 | class ShoppingCartPlugin < Noosfero::Plugin |
| 5 | 5 | ||
| 6 | def self.plugin_name | 6 | def self.plugin_name |
| 7 | - "Shopping Cart" | 7 | + "Shopping Basket" |
| 8 | end | 8 | end |
| 9 | 9 | ||
| 10 | def self.plugin_description | 10 | def self.plugin_description |
| 11 | - _("A shopping cart feature for enterprises") | 11 | + _("A shopping basket feature for enterprises") |
| 12 | end | 12 | end |
| 13 | 13 | ||
| 14 | def add_to_cart_button(item, enterprise = context.profile) | 14 | def add_to_cart_button(item, enterprise = context.profile) |
| 15 | if enterprise.shopping_cart && item.available | 15 | if enterprise.shopping_cart && item.available |
| 16 | lambda { | 16 | lambda { |
| 17 | - link_to(_('Add to cart'), "add:#{item.name}", | 17 | + link_to(_('Add to basket'), "add:#{item.name}", |
| 18 | :class => 'cart-add-item', | 18 | :class => 'cart-add-item', |
| 19 | :onclick => "Cart.addItem('#{enterprise.identifier}', #{item.id}, this); return false" | 19 | :onclick => "Cart.addItem('#{enterprise.identifier}', #{item.id}, this); return false" |
| 20 | ) | 20 | ) |
| @@ -22,7 +22,6 @@ class ShoppingCartPlugin < Noosfero::Plugin | @@ -22,7 +22,6 @@ class ShoppingCartPlugin < Noosfero::Plugin | ||
| 22 | end | 22 | end |
| 23 | end | 23 | end |
| 24 | 24 | ||
| 25 | - alias :product_info_extras :add_to_cart_button | ||
| 26 | alias :catalog_item_extras :add_to_cart_button | 25 | alias :catalog_item_extras :add_to_cart_button |
| 27 | alias :asset_product_extras :add_to_cart_button | 26 | alias :asset_product_extras :add_to_cart_button |
| 28 | 27 | ||
| @@ -41,10 +40,10 @@ class ShoppingCartPlugin < Noosfero::Plugin | @@ -41,10 +40,10 @@ class ShoppingCartPlugin < Noosfero::Plugin | ||
| 41 | def control_panel_buttons | 40 | def control_panel_buttons |
| 42 | buttons = [] | 41 | buttons = [] |
| 43 | if context.profile.enterprise? | 42 | if context.profile.enterprise? |
| 44 | - buttons << { :title => 'Shopping cart', :icon => 'shopping_cart_icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} } | 43 | + buttons << { :title => _('Shopping basket'), :icon => 'shopping-cart-icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} } |
| 45 | end | 44 | end |
| 46 | if context.profile.enterprise? && context.profile.shopping_cart | 45 | if context.profile.enterprise? && context.profile.shopping_cart |
| 47 | - buttons << { :title => 'Purchase reports', :icon => 'shopping-cart-purchase-report', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'reports'} } | 46 | + buttons << { :title => _('Purchase reports'), :icon => 'shopping-cart-purchase-report', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'reports'} } |
| 48 | end | 47 | end |
| 49 | 48 | ||
| 50 | buttons | 49 | buttons |
plugins/shopping_cart/public/cart.js
| @@ -62,7 +62,7 @@ function Cart(config) { | @@ -62,7 +62,7 @@ function Cart(config) { | ||
| 62 | '<div class="item-price">' + | 62 | '<div class="item-price">' + |
| 63 | '<input size="1" value="'+item.quantity+'" />'+ (item.price ? '× '+ item.price : '') +'</div>' + | 63 | '<input size="1" value="'+item.quantity+'" />'+ (item.price ? '× '+ item.price : '') +'</div>' + |
| 64 | ' <a href="remove:'+item.name+'" onclick="Cart.removeItem(\''+this.enterprise+'\', '+item.id+'); return false"' + | 64 | ' <a href="remove:'+item.name+'" onclick="Cart.removeItem(\''+this.enterprise+'\', '+item.id+'); return false"' + |
| 65 | - ' class="button icon-delete"><span>remove</span></a>' | 65 | + ' class="button icon-remove"><span>remove</span></a>' |
| 66 | ).appendTo(li); | 66 | ).appendTo(li); |
| 67 | var input = $("input", li)[0]; | 67 | var input = $("input", li)[0]; |
| 68 | input.lastValue = input.value; | 68 | input.lastValue = input.value; |
| @@ -304,6 +304,10 @@ function Cart(config) { | @@ -304,6 +304,10 @@ function Cart(config) { | ||
| 304 | }); | 304 | }); |
| 305 | } | 305 | } |
| 306 | 306 | ||
| 307 | + Cart.colorbox_close = function() { | ||
| 308 | + $.colorbox.close(); | ||
| 309 | + } | ||
| 310 | + | ||
| 307 | $(function(){ | 311 | $(function(){ |
| 308 | $('.cart-add-item').button({ icons: { primary: 'ui-icon-cart'} }) | 312 | $('.cart-add-item').button({ icons: { primary: 'ui-icon-cart'} }) |
| 309 | }); | 313 | }); |
827 Bytes
351 Bytes
1.96 KB
plugins/shopping_cart/public/images/control-panel/icon.svg
0 → 100644
| @@ -0,0 +1,120 @@ | @@ -0,0 +1,120 @@ | ||
| 1 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| 2 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
| 3 | + | ||
| 4 | +<svg | ||
| 5 | + xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
| 6 | + xmlns:cc="http://creativecommons.org/ns#" | ||
| 7 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
| 8 | + xmlns:svg="http://www.w3.org/2000/svg" | ||
| 9 | + xmlns="http://www.w3.org/2000/svg" | ||
| 10 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
| 11 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
| 12 | + width="744.09448819" | ||
| 13 | + height="1052.3622047" | ||
| 14 | + id="svg3362" | ||
| 15 | + version="1.1" | ||
| 16 | + inkscape:version="0.48.2 r9819" | ||
| 17 | + sodipodi:docname="icone.svg"> | ||
| 18 | + <defs | ||
| 19 | + id="defs3364" /> | ||
| 20 | + <sodipodi:namedview | ||
| 21 | + id="base" | ||
| 22 | + pagecolor="#ffffff" | ||
| 23 | + bordercolor="#666666" | ||
| 24 | + borderopacity="1.0" | ||
| 25 | + inkscape:pageopacity="0.0" | ||
| 26 | + inkscape:pageshadow="2" | ||
| 27 | + inkscape:zoom="0.7" | ||
| 28 | + inkscape:cx="278.97361" | ||
| 29 | + inkscape:cy="689.0069" | ||
| 30 | + inkscape:document-units="px" | ||
| 31 | + inkscape:current-layer="layer1" | ||
| 32 | + showgrid="false" | ||
| 33 | + inkscape:window-width="1366" | ||
| 34 | + inkscape:window-height="721" | ||
| 35 | + inkscape:window-x="-3" | ||
| 36 | + inkscape:window-y="-3" | ||
| 37 | + inkscape:window-maximized="1" /> | ||
| 38 | + <metadata | ||
| 39 | + id="metadata3367"> | ||
| 40 | + <rdf:RDF> | ||
| 41 | + <cc:Work | ||
| 42 | + rdf:about=""> | ||
| 43 | + <dc:format>image/svg+xml</dc:format> | ||
| 44 | + <dc:type | ||
| 45 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
| 46 | + <dc:title></dc:title> | ||
| 47 | + </cc:Work> | ||
| 48 | + </rdf:RDF> | ||
| 49 | + </metadata> | ||
| 50 | + <g | ||
| 51 | + inkscape:label="Layer 1" | ||
| 52 | + inkscape:groupmode="layer" | ||
| 53 | + id="layer1"> | ||
| 54 | + <g | ||
| 55 | + id="g5575-7" | ||
| 56 | + transform="matrix(0.07006136,0,0,0.07006136,-271.48534,-209.48041)" | ||
| 57 | + style="fill:#d38d5f"> | ||
| 58 | + <path | ||
| 59 | + inkscape:connector-curvature="0" | ||
| 60 | + id="rect5245-9-6" | ||
| 61 | + d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z" | ||
| 62 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 63 | + <path | ||
| 64 | + inkscape:connector-curvature="0" | ||
| 65 | + id="rect5245-3-6-2" | ||
| 66 | + d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z" | ||
| 67 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 68 | + <path | ||
| 69 | + inkscape:connector-curvature="0" | ||
| 70 | + id="rect5245-8-6-2" | ||
| 71 | + d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z" | ||
| 72 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 73 | + <path | ||
| 74 | + inkscape:connector-curvature="0" | ||
| 75 | + id="rect5245-7-4-7" | ||
| 76 | + d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z" | ||
| 77 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 78 | + <path | ||
| 79 | + inkscape:connector-curvature="0" | ||
| 80 | + id="rect5245-5-2-8" | ||
| 81 | + d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z" | ||
| 82 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 83 | + <path | ||
| 84 | + inkscape:connector-curvature="0" | ||
| 85 | + id="rect5245-5-4-1-9" | ||
| 86 | + d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z" | ||
| 87 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 88 | + <path | ||
| 89 | + inkscape:connector-curvature="0" | ||
| 90 | + id="rect5245-5-4-4-4-1" | ||
| 91 | + d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z" | ||
| 92 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 93 | + <path | ||
| 94 | + inkscape:connector-curvature="0" | ||
| 95 | + id="rect5245-5-4-7-7-7" | ||
| 96 | + d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z" | ||
| 97 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 98 | + <path | ||
| 99 | + inkscape:connector-curvature="0" | ||
| 100 | + id="rect5245-5-4-7-4-6-5" | ||
| 101 | + d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z" | ||
| 102 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 103 | + <path | ||
| 104 | + inkscape:connector-curvature="0" | ||
| 105 | + id="rect5245-5-4-7-4-3-3-0" | ||
| 106 | + d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z" | ||
| 107 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 108 | + <path | ||
| 109 | + inkscape:connector-curvature="0" | ||
| 110 | + id="rect5245-5-4-7-4-2-3-8" | ||
| 111 | + d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z" | ||
| 112 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 113 | + <path | ||
| 114 | + inkscape:connector-curvature="0" | ||
| 115 | + id="rect5245-5-4-7-4-3-5-8-2" | ||
| 116 | + d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z" | ||
| 117 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 118 | + </g> | ||
| 119 | + </g> | ||
| 120 | +</svg> |
1.6 KB
plugins/shopping_cart/public/images/control-panel/purchase-report.png
plugins/shopping_cart/public/images/control-panel/purchase-report.svg
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | height="48" | 14 | height="48" |
| 15 | id="svg2" | 15 | id="svg2" |
| 16 | version="1.1" | 16 | version="1.1" |
| 17 | - inkscape:version="0.47 r22583" | 17 | + inkscape:version="0.48.2 r9819" |
| 18 | sodipodi:docname="purchase-report.svg" | 18 | sodipodi:docname="purchase-report.svg" |
| 19 | inkscape:export-filename="/home/aurium/purchase-report.png" | 19 | inkscape:export-filename="/home/aurium/purchase-report.png" |
| 20 | inkscape:export-xdpi="90" | 20 | inkscape:export-xdpi="90" |
| @@ -352,10 +352,10 @@ | @@ -352,10 +352,10 @@ | ||
| 352 | inkscape:document-units="px" | 352 | inkscape:document-units="px" |
| 353 | inkscape:current-layer="layer1" | 353 | inkscape:current-layer="layer1" |
| 354 | showgrid="true" | 354 | showgrid="true" |
| 355 | - inkscape:window-width="1440" | ||
| 356 | - inkscape:window-height="827" | ||
| 357 | - inkscape:window-x="0" | ||
| 358 | - inkscape:window-y="25" | 355 | + inkscape:window-width="1366" |
| 356 | + inkscape:window-height="721" | ||
| 357 | + inkscape:window-x="-3" | ||
| 358 | + inkscape:window-y="-3" | ||
| 359 | inkscape:window-maximized="1"> | 359 | inkscape:window-maximized="1"> |
| 360 | <inkscape:grid | 360 | <inkscape:grid |
| 361 | type="xygrid" | 361 | type="xygrid" |
| @@ -419,120 +419,17 @@ | @@ -419,120 +419,17 @@ | ||
| 419 | ry="0" /> | 419 | ry="0" /> |
| 420 | <g | 420 | <g |
| 421 | id="g4873" | 421 | id="g4873" |
| 422 | - mask="url(#mask4922)"> | ||
| 423 | - <g | ||
| 424 | - transform="translate(6,1)" | ||
| 425 | - id="g4757"> | ||
| 426 | - <path | ||
| 427 | - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" | ||
| 428 | - d="m 2.5,2.5 2,0 0,8 12,0 0,-6" | ||
| 429 | - id="path2839" | ||
| 430 | - transform="translate(0,1004.3622)" | ||
| 431 | - sodipodi:nodetypes="ccccc" /> | ||
| 432 | - <path | ||
| 433 | - sodipodi:nodetypes="cccccc" | ||
| 434 | - id="path3619" | ||
| 435 | - style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0" | ||
| 436 | - d="m 15,1012.8622 -9.5,0 m 9.5,-2 -9.5,0 m 9.5,-2 -9.5,0" /> | ||
| 437 | - <path | ||
| 438 | - transform="translate(7.5,1000.8622)" | ||
| 439 | - d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z" | ||
| 440 | - sodipodi:ry="1.5" | ||
| 441 | - sodipodi:rx="1.5" | ||
| 442 | - sodipodi:cy="16" | ||
| 443 | - sodipodi:cx="7" | ||
| 444 | - id="path3647" | ||
| 445 | - style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 446 | - sodipodi:type="arc" /> | ||
| 447 | - <path | ||
| 448 | - sodipodi:type="arc" | ||
| 449 | - style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 450 | - id="path4776" | ||
| 451 | - sodipodi:cx="7" | ||
| 452 | - sodipodi:cy="16" | ||
| 453 | - sodipodi:rx="1.5" | ||
| 454 | - sodipodi:ry="1.5" | ||
| 455 | - d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z" | ||
| 456 | - transform="translate(-1,1000.8622)" /> | ||
| 457 | - </g> | ||
| 458 | - <g | ||
| 459 | - id="g4778" | ||
| 460 | - transform="translate(6,15)"> | ||
| 461 | - <path | ||
| 462 | - sodipodi:nodetypes="ccccc" | ||
| 463 | - transform="translate(0,1004.3622)" | ||
| 464 | - id="path4780" | ||
| 465 | - d="m 2.5,2.5 2,0 0,8 12,0 0,-6" | ||
| 466 | - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> | ||
| 467 | - <path | ||
| 468 | - d="m 15,1012.8622 -9.5,0 m 9.5,-2 -9.5,0 m 9.5,-2 -9.5,0" | ||
| 469 | - style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0" | ||
| 470 | - id="path4782" | ||
| 471 | - sodipodi:nodetypes="cccccc" /> | ||
| 472 | - <path | ||
| 473 | - sodipodi:type="arc" | ||
| 474 | - style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 475 | - id="path4784" | ||
| 476 | - sodipodi:cx="7" | ||
| 477 | - sodipodi:cy="16" | ||
| 478 | - sodipodi:rx="1.5" | ||
| 479 | - sodipodi:ry="1.5" | ||
| 480 | - d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z" | ||
| 481 | - transform="translate(7.5,1000.8622)" /> | ||
| 482 | - <path | ||
| 483 | - transform="translate(-1,1000.8622)" | ||
| 484 | - d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z" | ||
| 485 | - sodipodi:ry="1.5" | ||
| 486 | - sodipodi:rx="1.5" | ||
| 487 | - sodipodi:cy="16" | ||
| 488 | - sodipodi:cx="7" | ||
| 489 | - id="path4786" | ||
| 490 | - style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 491 | - sodipodi:type="arc" /> | ||
| 492 | - </g> | ||
| 493 | - <g | ||
| 494 | - transform="translate(6,29)" | ||
| 495 | - id="g4788"> | ||
| 496 | - <path | ||
| 497 | - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" | ||
| 498 | - d="m 2.5,2.5 2,0 0,8 12,0 0,-6" | ||
| 499 | - id="path4790" | ||
| 500 | - transform="translate(0,1004.3622)" | ||
| 501 | - sodipodi:nodetypes="ccccc" /> | ||
| 502 | - <path | ||
| 503 | - sodipodi:nodetypes="cccccc" | ||
| 504 | - id="path4792" | ||
| 505 | - style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0" | ||
| 506 | - d="m 15,1012.8622 -9.5,0 m 9.5,-2 -9.5,0 m 9.5,-2 -9.5,0" /> | ||
| 507 | - <path | ||
| 508 | - transform="translate(7.5,1000.8622)" | ||
| 509 | - d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z" | ||
| 510 | - sodipodi:ry="1.5" | ||
| 511 | - sodipodi:rx="1.5" | ||
| 512 | - sodipodi:cy="16" | ||
| 513 | - sodipodi:cx="7" | ||
| 514 | - id="path4794" | ||
| 515 | - style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 516 | - sodipodi:type="arc" /> | ||
| 517 | - <path | ||
| 518 | - sodipodi:type="arc" | ||
| 519 | - style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 520 | - id="path4796" | ||
| 521 | - sodipodi:cx="7" | ||
| 522 | - sodipodi:cy="16" | ||
| 523 | - sodipodi:rx="1.5" | ||
| 524 | - sodipodi:ry="1.5" | ||
| 525 | - d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z" | ||
| 526 | - transform="translate(-1,1000.8622)" /> | ||
| 527 | - </g> | 422 | + mask="url(#mask4922)" |
| 423 | + transform="translate(0,1.7382813e-5)"> | ||
| 528 | <path | 424 | <path |
| 529 | sodipodi:nodetypes="cccccc" | 425 | sodipodi:nodetypes="cccccc" |
| 530 | d="m 29.5,1015.8622 11,0 m -11,-3 11,0 m -11,-3 11,0" | 426 | d="m 29.5,1015.8622 11,0 m -11,-3 11,0 m -11,-3 11,0" |
| 531 | style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" | 427 | style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" |
| 532 | - id="path4802" /> | 428 | + id="path4802" |
| 429 | + inkscape:connector-curvature="0" /> | ||
| 533 | <path | 430 | <path |
| 534 | transform="translate(0,1004.3622)" | 431 | transform="translate(0,1004.3622)" |
| 535 | - d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" | 432 | + d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" |
| 536 | sodipodi:ry="1" | 433 | sodipodi:ry="1" |
| 537 | sodipodi:rx="1" | 434 | sodipodi:rx="1" |
| 538 | sodipodi:cy="5.5" | 435 | sodipodi:cy="5.5" |
| @@ -548,11 +445,11 @@ | @@ -548,11 +445,11 @@ | ||
| 548 | sodipodi:cy="5.5" | 445 | sodipodi:cy="5.5" |
| 549 | sodipodi:rx="1" | 446 | sodipodi:rx="1" |
| 550 | sodipodi:ry="1" | 447 | sodipodi:ry="1" |
| 551 | - d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" | 448 | + d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" |
| 552 | transform="translate(0,1007.3622)" /> | 449 | transform="translate(0,1007.3622)" /> |
| 553 | <path | 450 | <path |
| 554 | transform="translate(0,1010.3622)" | 451 | transform="translate(0,1010.3622)" |
| 555 | - d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" | 452 | + d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" |
| 556 | sodipodi:ry="1" | 453 | sodipodi:ry="1" |
| 557 | sodipodi:rx="1" | 454 | sodipodi:rx="1" |
| 558 | sodipodi:cy="5.5" | 455 | sodipodi:cy="5.5" |
| @@ -564,7 +461,8 @@ | @@ -564,7 +461,8 @@ | ||
| 564 | id="path4811" | 461 | id="path4811" |
| 565 | style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" | 462 | style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" |
| 566 | d="m 29.5,1029.8622 11,0 m -11,-3 11,0 m -11,-3 11,0" | 463 | d="m 29.5,1029.8622 11,0 m -11,-3 11,0 m -11,-3 11,0" |
| 567 | - sodipodi:nodetypes="cccccc" /> | 464 | + sodipodi:nodetypes="cccccc" |
| 465 | + inkscape:connector-curvature="0" /> | ||
| 568 | <path | 466 | <path |
| 569 | sodipodi:type="arc" | 467 | sodipodi:type="arc" |
| 570 | style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | 468 | style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
| @@ -573,11 +471,11 @@ | @@ -573,11 +471,11 @@ | ||
| 573 | sodipodi:cy="5.5" | 471 | sodipodi:cy="5.5" |
| 574 | sodipodi:rx="1" | 472 | sodipodi:rx="1" |
| 575 | sodipodi:ry="1" | 473 | sodipodi:ry="1" |
| 576 | - d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" | 474 | + d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" |
| 577 | transform="translate(0,1018.3622)" /> | 475 | transform="translate(0,1018.3622)" /> |
| 578 | <path | 476 | <path |
| 579 | transform="translate(0,1021.3622)" | 477 | transform="translate(0,1021.3622)" |
| 580 | - d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" | 478 | + d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" |
| 581 | sodipodi:ry="1" | 479 | sodipodi:ry="1" |
| 582 | sodipodi:rx="1" | 480 | sodipodi:rx="1" |
| 583 | sodipodi:cy="5.5" | 481 | sodipodi:cy="5.5" |
| @@ -593,15 +491,16 @@ | @@ -593,15 +491,16 @@ | ||
| 593 | sodipodi:cy="5.5" | 491 | sodipodi:cy="5.5" |
| 594 | sodipodi:rx="1" | 492 | sodipodi:rx="1" |
| 595 | sodipodi:ry="1" | 493 | sodipodi:ry="1" |
| 596 | - d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" | 494 | + d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" |
| 597 | transform="translate(0,1024.3622)" /> | 495 | transform="translate(0,1024.3622)" /> |
| 598 | <path | 496 | <path |
| 599 | id="path4827" | 497 | id="path4827" |
| 600 | style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" | 498 | style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" |
| 601 | - d="m 29.5,1038.8622 11,0 m -11,3 11,0 m -11,3 9,0" /> | 499 | + d="m 29.5,1038.8622 11,0 m -11,3 11,0 m -11,3 9,0" |
| 500 | + inkscape:connector-curvature="0" /> | ||
| 602 | <path | 501 | <path |
| 603 | transform="translate(0,1033.3622)" | 502 | transform="translate(0,1033.3622)" |
| 604 | - d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" | 503 | + d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" |
| 605 | sodipodi:ry="1" | 504 | sodipodi:ry="1" |
| 606 | sodipodi:rx="1" | 505 | sodipodi:rx="1" |
| 607 | sodipodi:cy="5.5" | 506 | sodipodi:cy="5.5" |
| @@ -617,11 +516,11 @@ | @@ -617,11 +516,11 @@ | ||
| 617 | sodipodi:cy="5.5" | 516 | sodipodi:cy="5.5" |
| 618 | sodipodi:rx="1" | 517 | sodipodi:rx="1" |
| 619 | sodipodi:ry="1" | 518 | sodipodi:ry="1" |
| 620 | - d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" | 519 | + d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" |
| 621 | transform="translate(0,1036.3622)" /> | 520 | transform="translate(0,1036.3622)" /> |
| 622 | <path | 521 | <path |
| 623 | transform="translate(0,1039.3622)" | 522 | transform="translate(0,1039.3622)" |
| 624 | - d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" | 523 | + d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" |
| 625 | sodipodi:ry="1" | 524 | sodipodi:ry="1" |
| 626 | sodipodi:rx="1" | 525 | sodipodi:rx="1" |
| 627 | sodipodi:cy="5.5" | 526 | sodipodi:cy="5.5" |
| @@ -629,6 +528,201 @@ | @@ -629,6 +528,201 @@ | ||
| 629 | id="path4833" | 528 | id="path4833" |
| 630 | style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | 529 | style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" |
| 631 | sodipodi:type="arc" /> | 530 | sodipodi:type="arc" /> |
| 531 | + <g | ||
| 532 | + id="g5575-7" | ||
| 533 | + transform="matrix(0.01545762,0,0,0.01545762,-84.564216,932.96399)" | ||
| 534 | + style="fill:#d38d5f"> | ||
| 535 | + <path | ||
| 536 | + inkscape:connector-curvature="0" | ||
| 537 | + id="rect5245-9-6" | ||
| 538 | + d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z" | ||
| 539 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 540 | + <path | ||
| 541 | + inkscape:connector-curvature="0" | ||
| 542 | + id="rect5245-3-6-2" | ||
| 543 | + d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z" | ||
| 544 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 545 | + <path | ||
| 546 | + inkscape:connector-curvature="0" | ||
| 547 | + id="rect5245-8-6-2" | ||
| 548 | + d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z" | ||
| 549 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 550 | + <path | ||
| 551 | + inkscape:connector-curvature="0" | ||
| 552 | + id="rect5245-7-4-7" | ||
| 553 | + d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z" | ||
| 554 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 555 | + <path | ||
| 556 | + inkscape:connector-curvature="0" | ||
| 557 | + id="rect5245-5-2-8" | ||
| 558 | + d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z" | ||
| 559 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 560 | + <path | ||
| 561 | + inkscape:connector-curvature="0" | ||
| 562 | + id="rect5245-5-4-1-9" | ||
| 563 | + d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z" | ||
| 564 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 565 | + <path | ||
| 566 | + inkscape:connector-curvature="0" | ||
| 567 | + id="rect5245-5-4-4-4-1" | ||
| 568 | + d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z" | ||
| 569 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 570 | + <path | ||
| 571 | + inkscape:connector-curvature="0" | ||
| 572 | + id="rect5245-5-4-7-7-7" | ||
| 573 | + d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z" | ||
| 574 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 575 | + <path | ||
| 576 | + inkscape:connector-curvature="0" | ||
| 577 | + id="rect5245-5-4-7-4-6-5" | ||
| 578 | + d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z" | ||
| 579 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 580 | + <path | ||
| 581 | + inkscape:connector-curvature="0" | ||
| 582 | + id="rect5245-5-4-7-4-3-3-0" | ||
| 583 | + d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z" | ||
| 584 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 585 | + <path | ||
| 586 | + inkscape:connector-curvature="0" | ||
| 587 | + id="rect5245-5-4-7-4-2-3-8" | ||
| 588 | + d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z" | ||
| 589 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 590 | + <path | ||
| 591 | + inkscape:connector-curvature="0" | ||
| 592 | + id="rect5245-5-4-7-4-3-5-8-2" | ||
| 593 | + d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z" | ||
| 594 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 595 | + </g> | ||
| 596 | + <g | ||
| 597 | + id="g5575-7-8" | ||
| 598 | + transform="matrix(0.01545762,0,0,0.01545762,-84.486184,947.26528)" | ||
| 599 | + style="fill:#d38d5f"> | ||
| 600 | + <path | ||
| 601 | + inkscape:connector-curvature="0" | ||
| 602 | + id="rect5245-9-6-5" | ||
| 603 | + d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z" | ||
| 604 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 605 | + <path | ||
| 606 | + inkscape:connector-curvature="0" | ||
| 607 | + id="rect5245-3-6-2-0" | ||
| 608 | + d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z" | ||
| 609 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 610 | + <path | ||
| 611 | + inkscape:connector-curvature="0" | ||
| 612 | + id="rect5245-8-6-2-9" | ||
| 613 | + d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z" | ||
| 614 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 615 | + <path | ||
| 616 | + inkscape:connector-curvature="0" | ||
| 617 | + id="rect5245-7-4-7-6" | ||
| 618 | + d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z" | ||
| 619 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 620 | + <path | ||
| 621 | + inkscape:connector-curvature="0" | ||
| 622 | + id="rect5245-5-2-8-3" | ||
| 623 | + d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z" | ||
| 624 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 625 | + <path | ||
| 626 | + inkscape:connector-curvature="0" | ||
| 627 | + id="rect5245-5-4-1-9-8" | ||
| 628 | + d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z" | ||
| 629 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 630 | + <path | ||
| 631 | + inkscape:connector-curvature="0" | ||
| 632 | + id="rect5245-5-4-4-4-1-5" | ||
| 633 | + d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z" | ||
| 634 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 635 | + <path | ||
| 636 | + inkscape:connector-curvature="0" | ||
| 637 | + id="rect5245-5-4-7-7-7-6" | ||
| 638 | + d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z" | ||
| 639 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 640 | + <path | ||
| 641 | + inkscape:connector-curvature="0" | ||
| 642 | + id="rect5245-5-4-7-4-6-5-1" | ||
| 643 | + d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z" | ||
| 644 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 645 | + <path | ||
| 646 | + inkscape:connector-curvature="0" | ||
| 647 | + id="rect5245-5-4-7-4-3-3-0-1" | ||
| 648 | + d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z" | ||
| 649 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 650 | + <path | ||
| 651 | + inkscape:connector-curvature="0" | ||
| 652 | + id="rect5245-5-4-7-4-2-3-8-5" | ||
| 653 | + d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z" | ||
| 654 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 655 | + <path | ||
| 656 | + inkscape:connector-curvature="0" | ||
| 657 | + id="rect5245-5-4-7-4-3-5-8-2-9" | ||
| 658 | + d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z" | ||
| 659 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 660 | + </g> | ||
| 661 | + <g | ||
| 662 | + id="g5575-7-8-8" | ||
| 663 | + transform="matrix(0.01545762,0,0,0.01545762,-84.564216,961.96398)" | ||
| 664 | + style="fill:#d38d5f"> | ||
| 665 | + <path | ||
| 666 | + inkscape:connector-curvature="0" | ||
| 667 | + id="rect5245-9-6-5-4" | ||
| 668 | + d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z" | ||
| 669 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 670 | + <path | ||
| 671 | + inkscape:connector-curvature="0" | ||
| 672 | + id="rect5245-3-6-2-0-8" | ||
| 673 | + d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z" | ||
| 674 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 675 | + <path | ||
| 676 | + inkscape:connector-curvature="0" | ||
| 677 | + id="rect5245-8-6-2-9-1" | ||
| 678 | + d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z" | ||
| 679 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 680 | + <path | ||
| 681 | + inkscape:connector-curvature="0" | ||
| 682 | + id="rect5245-7-4-7-6-0" | ||
| 683 | + d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z" | ||
| 684 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 685 | + <path | ||
| 686 | + inkscape:connector-curvature="0" | ||
| 687 | + id="rect5245-5-2-8-3-3" | ||
| 688 | + d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z" | ||
| 689 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 690 | + <path | ||
| 691 | + inkscape:connector-curvature="0" | ||
| 692 | + id="rect5245-5-4-1-9-8-0" | ||
| 693 | + d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z" | ||
| 694 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 695 | + <path | ||
| 696 | + inkscape:connector-curvature="0" | ||
| 697 | + id="rect5245-5-4-4-4-1-5-4" | ||
| 698 | + d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z" | ||
| 699 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 700 | + <path | ||
| 701 | + inkscape:connector-curvature="0" | ||
| 702 | + id="rect5245-5-4-7-7-7-6-4" | ||
| 703 | + d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z" | ||
| 704 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 705 | + <path | ||
| 706 | + inkscape:connector-curvature="0" | ||
| 707 | + id="rect5245-5-4-7-4-6-5-1-4" | ||
| 708 | + d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z" | ||
| 709 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 710 | + <path | ||
| 711 | + inkscape:connector-curvature="0" | ||
| 712 | + id="rect5245-5-4-7-4-3-3-0-1-4" | ||
| 713 | + d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z" | ||
| 714 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 715 | + <path | ||
| 716 | + inkscape:connector-curvature="0" | ||
| 717 | + id="rect5245-5-4-7-4-2-3-8-5-7" | ||
| 718 | + d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z" | ||
| 719 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 720 | + <path | ||
| 721 | + inkscape:connector-curvature="0" | ||
| 722 | + id="rect5245-5-4-7-4-3-5-8-2-9-6" | ||
| 723 | + d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z" | ||
| 724 | + style="fill:#d38d5f;fill-opacity:1;stroke:none" /> | ||
| 725 | + </g> | ||
| 632 | </g> | 726 | </g> |
| 633 | <g | 727 | <g |
| 634 | id="g4835" | 728 | id="g4835" |
plugins/shopping_cart/public/style.css
| 1 | @import url(colorbox/colorbox.css); | 1 | @import url(colorbox/colorbox.css); |
| 2 | 2 | ||
| 3 | -.cart-add-item { | ||
| 4 | - position: absolute; | ||
| 5 | - right: 5px; | ||
| 6 | - top: 5px; | 3 | +.cart-add-item .ui-icon-cart { |
| 4 | + background: url("images/button-icon.png") no-repeat scroll left center transparent; | ||
| 5 | + width: 22px; | ||
| 6 | + } | ||
| 7 | + .cart-buy .ui-icon-cart { | ||
| 8 | + background: url("images/button-icon.png") no-repeat scroll left center transparent; | ||
| 9 | + width: 22px; | ||
| 10 | + } | ||
| 11 | +.cart-add-item .ui-button-text { | ||
| 12 | + padding-left: 2.6em; | ||
| 7 | } | 13 | } |
| 8 | 14 | ||
| 9 | .product-item .cart-add-item { | 15 | .product-item .cart-add-item { |
| @@ -13,16 +19,15 @@ | @@ -13,16 +19,15 @@ | ||
| 13 | .cart { | 19 | .cart { |
| 14 | position: fixed; | 20 | position: fixed; |
| 15 | right: 20px; | 21 | right: 20px; |
| 16 | - top: 0px; | 22 | + bottom: 0px; |
| 17 | width: 200px; | 23 | width: 200px; |
| 18 | z-index: 1000; | 24 | z-index: 1000; |
| 19 | border: 1px solid #777; | 25 | border: 1px solid #777; |
| 20 | - border-top: none; | ||
| 21 | - background: rgba(200,200,200,0.6); | 26 | + background: rgba(100,100,100,0.8); |
| 22 | } | 27 | } |
| 23 | 28 | ||
| 24 | .cart h3 { | 29 | .cart h3 { |
| 25 | - color: #888; | 30 | + color: #000; |
| 26 | margin: 0px 0px 0px 5px; | 31 | margin: 0px 0px 0px 5px; |
| 27 | } | 32 | } |
| 28 | 33 | ||
| @@ -108,7 +113,7 @@ | @@ -108,7 +113,7 @@ | ||
| 108 | padding: 0px 5px; | 113 | padding: 0px 5px; |
| 109 | } | 114 | } |
| 110 | .cart-toggle:hover { | 115 | .cart-toggle:hover { |
| 111 | - color: #555; | 116 | + color: #fff; |
| 112 | } | 117 | } |
| 113 | 118 | ||
| 114 | #cart-request-box { | 119 | #cart-request-box { |
| @@ -120,6 +125,15 @@ | @@ -120,6 +125,15 @@ | ||
| 120 | float: left; | 125 | float: left; |
| 121 | } | 126 | } |
| 122 | 127 | ||
| 128 | +#cart-request-box .cart-box-close { | ||
| 129 | + position: absolute; | ||
| 130 | + right: 10px; | ||
| 131 | + bottom: 10px; | ||
| 132 | + width: 16px; | ||
| 133 | + height: 16px; | ||
| 134 | + background-repeat: no-repeat; | ||
| 135 | +} | ||
| 136 | + | ||
| 123 | #cart-form-main { | 137 | #cart-form-main { |
| 124 | border: 2px solid #FFF; | 138 | border: 2px solid #FFF; |
| 125 | padding: 0px 10px; | 139 | padding: 0px 10px; |
| @@ -171,8 +185,8 @@ label.error { | @@ -171,8 +185,8 @@ label.error { | ||
| 171 | 185 | ||
| 172 | .controller-profile_editor a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.png)} | 186 | .controller-profile_editor a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.png)} |
| 173 | .controller-profile_editor .msie6 a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.gif)} | 187 | .controller-profile_editor .msie6 a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.gif)} |
| 174 | -.controller-profile_editor a.control-panel-shopping-cart {background-image: url(/images/control-panel/shopping-cart.png)} | ||
| 175 | -.controller-profile_editor .msie6 a.control-panel-shopping-cart {background-image: url(/images/control-panel/shopping-cart.gif)} | 188 | +.controller-profile_editor a.control-panel-shopping-cart-icon {background-image: url(images/control-panel/icon.png)} |
| 189 | +.controller-profile_editor .msie6 a.control-panel-shopping-cart-icon {background-image: url(images/control-panel/icon.gif)} | ||
| 176 | 190 | ||
| 177 | .action-shopping_cart_plugin_myprofile-reports td.order-info { | 191 | .action-shopping_cart_plugin_myprofile-reports td.order-info { |
| 178 | padding: 0px; | 192 | padding: 0px; |
plugins/shopping_cart/views/cart.html.erb
| 1 | <div id="cart1" class="cart" style="display:none" | 1 | <div id="cart1" class="cart" style="display:none" |
| 2 | data-l10nRemoveItem="<%=_('Are you sure you want to remove this item?')%>" | 2 | data-l10nRemoveItem="<%=_('Are you sure you want to remove this item?')%>" |
| 3 | - data-l10nCleanCart="<%=_('Are you sure you want to clean your cart?')%>"> | 3 | + data-l10nCleanCart="<%=_('Are you sure you want to clean your basket?')%>"> |
| 4 | <div class="cart-inner"> | 4 | <div class="cart-inner"> |
| 5 | <div class="cart-content"> | 5 | <div class="cart-content"> |
| 6 | - <h3><%= _("Cart") %></h3> | ||
| 7 | - <a href="cart:clean" onclick="Cart.clean(this); return false" class="cart-clean"><%=_('Clean cart')%></a> | 6 | + <h3><%= _("Basket") %></h3> |
| 7 | + <a href="cart:clean" onclick="Cart.clean(this); return false" class="cart-clean"><%=_('Clean basket')%></a> | ||
| 8 | <ul class="cart-items"></ul> | 8 | <ul class="cart-items"></ul> |
| 9 | <div class="cart-total"><%=_('Total:')%> <b></b></div> | 9 | <div class="cart-total"><%=_('Total:')%> <b></b></div> |
| 10 | <a href="cart:buy" class="cart-buy"><%=_('Shopping checkout')%></a> | 10 | <a href="cart:buy" class="cart-buy"><%=_('Shopping checkout')%></a> |
| 11 | </div> | 11 | </div> |
| 12 | <a href="#" onclick="Cart.toggle(this); return false" class="cart-toggle"> | 12 | <a href="#" onclick="Cart.toggle(this); return false" class="cart-toggle"> |
| 13 | - <span class="str-show"><%=_('Show cart')%></span> | ||
| 14 | - <span class="str-hide" style="display:none"><%=_('Hide cart')%></span> | 13 | + <span class="str-show"><%=_('Show basket')%></span> |
| 14 | + <span class="str-hide" style="display:none"><%=_('Hide basket')%></span> | ||
| 15 | </a> | 15 | </a> |
| 16 | </div> | 16 | </div> |
| 17 | </div> | 17 | </div> |
plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
| 1 | -<h1> <%= _('Cart options') %> </h1> | 1 | +<h1> <%= _('Basket options') %> </h1> |
| 2 | 2 | ||
| 3 | <% form_for(:profile_attr, profile, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %> | 3 | <% form_for(:profile_attr, profile, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %> |
| 4 | <%= labelled_form_field(_('Enabled?'), f.check_box(:shopping_cart)) %> | 4 | <%= labelled_form_field(_('Enabled?'), f.check_box(:shopping_cart)) %> |
plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
| @@ -17,6 +17,7 @@ | @@ -17,6 +17,7 @@ | ||
| 17 | </div> | 17 | </div> |
| 18 | <% end %> | 18 | <% end %> |
| 19 | <%= items_table(session[:cart][:items], profile) %> | 19 | <%= items_table(session[:cart][:items], profile) %> |
| 20 | + <a href="" onclick="Cart.colorbox_close(this);" class="cart-box-close icon-cancel"/> | ||
| 20 | </div> | 21 | </div> |
| 21 | 22 | ||
| 22 | <script type="text/javascript"> | 23 | <script type="text/javascript"> |