Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/391289 )
Change subject: planet: add Wikimedia Community Logo to rawdog style ...................................................................... planet: add Wikimedia Community Logo to rawdog style Add Wikimedia Community Logo as svg from commons. (https://meta.wikimedia.org/wiki/Wikimedia_Community_Logo) Add it to the default style for rawdog. Bug: T180498 Change-Id: If1bdf95b54fd0b8ef3a12079032e3b64c61971ae --- A modules/planet/files/theme/Wikimedia_Community_Logo.svg M modules/planet/manifests/theme.pp M modules/planet/templates/html/rd_page.html.tmpl.erb 3 files changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/89/391289/1 diff --git a/modules/planet/files/theme/Wikimedia_Community_Logo.svg b/modules/planet/files/theme/Wikimedia_Community_Logo.svg new file mode 100644 index 0000000..96ac36f --- /dev/null +++ b/modules/planet/files/theme/Wikimedia_Community_Logo.svg @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://web.resource.org/cc/"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + version="1.0" + width="900" + height="900" + id="svg2848" + sodipodi:version="0.32" + inkscape:version="0.44.1" + sodipodi:docname="Wikimedia_Community_Logo.svg" + sodipodi:docbase="/home/fizyk/anizo/wiki/SVG/promocja"> + <metadata + id="metadata1970"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + inkscape:window-height="670" + inkscape:window-width="950" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + height="900px" + width="900px" + inkscape:zoom="0.51444444" + inkscape:cx="450" + inkscape:cy="450" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:current-layer="svg2848" /> + <defs + id="defs2850" /> + <g + transform="matrix(2,0,0,2,-61.4375,-67.125)" + id="layer1"> + <path + d="M 189.02218,124.20633 C 172.69178,132.29681 158.45146,143.04328 146.5673,155.66847 C 152.48762,155.78249 158.44225,155.51722 164.40102,154.84751 C 171.27983,143.7634 179.5207,133.45773 189.02218,124.20633 z M 203.09865,118.10031 C 215.78116,117.50212 228.38578,118.36609 240.66396,120.67652 C 244.90072,116.87945 248.85655,112.81889 252.54754,108.57279 C 236.02594,108.90998 219.33784,112.00274 203.09865,118.10031 z M 195.30933,131.86845 C 188.75688,138.31296 182.86378,145.29993 177.64553,152.71309 C 185.56284,151.02077 193.43615,148.58105 201.17907,145.40021 L 195.30933,131.86845 z M 204.49584,127.91763 L 210.3034,141.30605 C 217.43047,137.76184 224.11036,133.64091 230.3398,129.07217 C 221.83028,127.96488 213.18331,127.55909 204.49584,127.91763 z M 265.2405,108.85767 C 261.30615,113.93462 257.0281,118.78774 252.4154,123.34549 C 275.03568,129.36443 296.20164,140.2413 314.27436,155.30599 C 320.97945,147.19168 327.04254,138.61814 332.45059,129.67457 C 312.09925,117.58338 289.02987,110.39965 265.2405,108.85767 z M 138.23449,165.27819 C 123.4445,183.94447 113.32569,205.85153 108.64602,229.07174 C 119.01741,231.07621 129.5647,232.33792 140.2008,232.79044 C 141.25548,209.22554 147.55615,186.20961 158.39497,165.42362 C 151.64603,165.84353 144.90502,165.78424 138.23449,165.27819 z M 243.56684,131.37357 C 234.76217,138.75166 224.97369,145.1729 214.27045,150.45146 L 241.06981,212.23313 C 267.04988,199.91753 289.47402,182.96707 307.76251,162.83141 C 289.1782,147.3423 267.09353,136.57903 243.56684,131.37357 z M 170.31795,164.16901 C 158.22474,185.09544 151.22232,208.71027 150.12768,232.98077 C 177.45958,232.86733 205.20642,227.49869 231.93304,216.29863 L 205.15856,154.57429 C 193.73425,159.2839 182.04446,162.46453 170.31795,164.16901 z M 340.86162,135.08694 C 335.18006,144.46232 328.793,153.43941 321.75108,161.94115 C 336.89228,176.26891 349.43237,193.7952 358.22897,214.07438 C 360.04665,218.26476 361.67856,222.48749 363.11011,226.74057 C 373.22059,216.33531 382.50574,205.27385 390.91693,193.62749 C 379.2474,169.28369 361.765,149.46657 340.86162,135.08694 z M 106.99044,238.91887 C 103.64369,264.03131 106.61894,290.27984 116.85771,315.30076 C 131.11683,316.8666 145.54592,317.43131 160.03217,316.90859 C 157.55148,312.43139 155.2663,307.80629 153.18835,303.0159 C 144.67721,283.39481 140.44738,262.97653 140.07645,242.79089 C 128.92629,242.32659 117.8652,241.01281 106.99044,238.91887 z M 315.19813,169.45034 C 295.97565,190.65685 272.39052,208.49272 245.04929,221.40721 L 274.54723,289.41006 C 305.03416,275.31044 332.04211,256.69196 355.1351,234.66223 C 353.45684,229.07558 351.43286,223.53589 349.05489,218.05386 C 340.86389,199.17081 329.2315,182.83438 315.19813,169.45034 z M 149.99089,242.95255 C 150.40291,261.74874 154.40179,280.76294 162.33376,299.04885 C 164.94267,305.06328 167.90482,310.81276 171.17834,316.29752 C 202.82296,313.96005 234.60616,306.51094 265.41047,293.47555 L 235.91252,225.4727 C 207.85924,237.24566 178.705,242.871 149.99089,242.95255 z M 395.48091,204.14901 C 386.62683,215.93663 376.90655,227.14084 366.33803,237.63725 C 373.24424,264.33449 372.86354,291.70844 366.21189,317.3662 C 379.21475,307.95806 391.49951,297.80691 402.99648,286.96709 C 408.22641,260.025 406.10703,231.40302 395.48091,204.14901 z M 121.61857,325.805 C 134.68569,351.9078 154.52826,372.66105 178.04515,386.86168 C 193.5249,385.62177 209.01562,383.3987 224.45759,380.15009 C 201.16358,367.74577 180.84679,349.59637 165.88521,326.6325 C 151.04839,327.42981 136.25513,327.13485 121.61857,325.805 z M 357.99412,245.65081 C 334.9786,266.84267 308.37138,284.8423 278.53916,298.6128 L 302.7021,354.31665 C 320.4841,346.19378 337.33602,336.8819 353.17832,326.42617 C 353.18315,326.41217 353.18972,326.39906 353.19455,326.38507 C 361.99428,300.8602 363.97806,272.97809 357.99412,245.65081 z M 177.35053,325.81486 C 193.36707,348.52178 215.1267,365.82034 239.7393,376.58697 C 257.85453,371.96525 275.82768,365.89093 293.55289,358.35348 L 269.38995,302.64963 C 239.30284,315.39106 208.28817,322.98465 177.35053,325.81486 z M 398.47352,304.49599 C 386.7902,314.65669 374.41959,324.17707 361.36037,332.95976 C 353.06628,355.36308 339.78643,375.95219 322.2929,392.96236 C 359.8382,374.39993 386.42134,341.89057 398.47352,304.49599 z M 193.97837,395.2447 C 229.03839,411.0607 270.03064,413.42189 308.41711,398.98133 C 284.47041,400.12127 260.8019,395.93363 239.08751,387.02058 C 224.10499,390.7056 209.04384,393.42887 193.97837,395.2447 z M 346.61322,342.38835 C 333.8803,350.12408 320.5669,357.1901 306.69402,363.5194 L 316.09556,385.19315 C 328.80636,372.68441 339.07662,358.16113 346.61322,342.38835 z M 255.74809,382.55277 C 272.14023,387.62235 289.44731,389.92552 306.93392,389.20131 L 297.53238,367.52755 C 283.73583,373.39724 269.79744,378.41311 255.74809,382.55277 z " + style="fill:#396;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path2862" /> + <path + d="M 255.71875,33.5625 C 178.93962,33.5625 111.10867,72.086118 70.5,130.84375 L 114,155.96875 C 145.8111,112.11504 197.43839,83.5625 255.71875,83.5625 C 313.99911,83.562502 365.6264,112.11504 397.4375,155.96875 L 440.9375,130.84375 C 400.32883,72.086118 332.49788,33.5625 255.71875,33.5625 z " + style="opacity:1;fill:#900;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4005" /> + <path + d="M 46.8125,174.9375 C 36.442946,200.79582 30.71875,229.01254 30.71875,258.5625 C 30.71875,374.31432 118.2675,469.74106 230.71875,482.1875 L 230.71875,431.75 C 145.95412,419.60155 80.71875,346.67019 80.71875,258.5625 C 80.718751,238.11672 84.234053,218.49436 90.6875,200.25 L 46.8125,174.9375 z " + style="opacity:1;fill:#069;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4003" /> + <path + d="M 464.625,174.9375 L 420.75,200.25 C 427.20345,218.49436 430.71875,238.11672 430.71875,258.5625 C 430.71875,346.67018 365.48339,419.60155 280.71875,431.75 L 280.71875,482.1875 C 393.16999,469.74106 480.71874,374.31432 480.71875,258.5625 C 480.71875,229.01254 474.99455,200.79582 464.625,174.9375 z " + style="opacity:1;fill:#069;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path3918" /> + </g> +</svg> diff --git a/modules/planet/manifests/theme.pp b/modules/planet/manifests/theme.pp index 6f8821c..238024e 100644 --- a/modules/planet/manifests/theme.pp +++ b/modules/planet/manifests/theme.pp @@ -22,6 +22,10 @@ ensure => 'present', source => 'puppet:///modules/planet/theme/rawdog_style.css'; } + file { "/var/www/planet/${title}/Wikimedia_Community_Logo.svg": + ensure => 'present', + source => 'puppet:///modules/planet/theme/Wikimedia_Community_Logo.svg'; + } file { "/etc/rawdog/theme/wikimedia/${title}/rd_page.tmpl": ensure => 'present', content => template('planet/html/rd_page.html.tmpl.erb'); diff --git a/modules/planet/templates/html/rd_page.html.tmpl.erb b/modules/planet/templates/html/rd_page.html.tmpl.erb index e1cefb2..d58d2af 100644 --- a/modules/planet/templates/html/rd_page.html.tmpl.erb +++ b/modules/planet/templates/html/rd_page.html.tmpl.erb @@ -124,6 +124,7 @@ <body id="rawdog" onload="readReadColor()"> <div id="page"> <div id="header"> + <img src="Wikimedia_Community_Logo.svg" alt="Wikimedia Community Logo" style="width: 7%; vertical-align: top; padding: 10px 10px 10px 10px;" align="left" /> <h1><%= @title %>.planet.wikimedia.org</h1> <h3>(rawdog __version__: __num_items__ items from __num_feeds__ feeds)</h3> <p><a onclick="toggleall('block')">Open all</a> <a onclick="toggleall('none')">Close all</a> <a onclick="markAllRead()">Mark All Read</a></p> -- To view, visit https://gerrit.wikimedia.org/r/391289 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1bdf95b54fd0b8ef3a12079032e3b64c61971ae Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
